From: Fan Zhang <zhfan@google.com>
Date: Wed, 13 Feb 2019 18:00:16 +0000 (+0000)
Subject: Revert "Enable static overlay for SettingsLib resources"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=086c189e20b27209c07af08264050f6c7b60cf48;p=android-x86%2Fframeworks-base.git

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
---

diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index 308c640059f5..834b83b49ada 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -26,4 +26,3 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
     androidx.legacy_legacy-preference-v14 \
     SettingsLib
 
-LOCAL_RESOURCE_DIR += $(call my-dir)/res