commit 1ea003e8347237e5f6a4a696aa741a32d169e620
author Fan Zhang <zhfan@google.com> Wed Feb 13 17:59:40 2019 +0000
committer Fan Zhang <zhfan@google.com> Wed Feb 13 17:59:40 2019 +0000
tree 9e150fd9a17cfc0c09c11c389a9f7df0d5f5afe5
parent 910457e37a45c4c717466aadfdf9d3fcd62135d4

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