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

am: 32fbf4740d

Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
This commit is contained in:
Fan Zhang
2019-02-13 10:29:46 -08:00
committed by android-build-merger

View File

@@ -20,8 +20,6 @@ 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 := \