diff options
| author | Fan Zhang <zhfan@google.com> | 2019-02-13 18:00:16 +0000 |
|---|---|---|
| committer | Fan Zhang <zhfan@google.com> | 2019-02-13 18:00:16 +0000 |
| commit | 086c189e20b27209c07af08264050f6c7b60cf48 (patch) | |
| tree | 1e448768e7f6b581f6f9c05558c8bad65a9590e7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6828b0f191e49859345d81694282e1dcda599462 (diff) | |
Revert "Enable static overlay for SettingsLib resources"
This reverts commit 6828b0f191e49859345d81694282e1dcda599462.
Fixes: 124370422
Reason for revert: b/124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I9b980c512eb354f87470bcefe1df095fc5c9a807
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions