Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38

am: b496699104

Change-Id: I4ad127ad793b1c154af8536b8b989aafd283e787
This commit is contained in:
Takamasa Kuramitsu
2019-03-01 16:52:30 -08:00
committed by android-build-merger

View File

@@ -20,6 +20,8 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \