Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit 910457e37a45c4c717466aadfdf9d3fcd62135d4.
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: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
diff --git a/Android.mk b/Android.mk
index 938112a..0466a1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,8 +18,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_USE_AAPT2 := true
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \