From 3593bfe1f42144f9346e872bf7694c436d4bce2c Mon Sep 17 00:00:00 2001 From: "joker.yang" Date: Thu, 4 Jul 2019 13:23:31 +0800 Subject: [PATCH] Remove LOCAL_SRC_FILES from RRO modules If LOCAL_SRC_FILES is not empty then building rro package will fail. Sometimes LOCAL_SRC_FILES will be not empty by mistake, so delete LOCAL_SRC_FILES for all rro modules. Bug: 136694299 Test: treehugger Change-Id: I2555c97f4ae98f6949837a19b4db4877cb38b607 Merged-In: I2555c97f4ae98f6949837a19b4db4877cb38b607 --- .../overlays/DisplayCutoutEmulationCornerOverlay/Android.mk | 2 -- .../overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk | 2 -- .../overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk | 2 -- packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk | 2 -- packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk | 2 -- packages/overlays/SysuiDarkThemeOverlay/Android.mk | 2 -- 6 files changed, 12 deletions(-) diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk index 74c43b40616fe..f5ad08978c114 100644 --- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk +++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := DisplayCutoutEmulationCorner LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := DisplayCutoutEmulationCornerOverlay diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk index d83b30a8785a7..626455655a173 100644 --- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk +++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := DisplayCutoutEmulationDouble LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := DisplayCutoutEmulationDoubleOverlay diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk index f5afad24676f9..2ebb87bb00d07 100644 --- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk +++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := DisplayCutoutEmulationNarrow LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := DisplayCutoutEmulationNarrowOverlay diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk index f1f8c27d94f12..cab86f7920e8e 100644 --- a/packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk +++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := DisplayCutoutEmulationTall LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := DisplayCutoutEmulationTallOverlay diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk b/packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk index d149d8ecf4df4..51c6f5fd1157e 100644 --- a/packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk +++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := DisplayCutoutEmulationWide LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := DisplayCutoutEmulationWideOverlay diff --git a/packages/overlays/SysuiDarkThemeOverlay/Android.mk b/packages/overlays/SysuiDarkThemeOverlay/Android.mk index 7b277bcf03511..fd3d5d22403b9 100644 --- a/packages/overlays/SysuiDarkThemeOverlay/Android.mk +++ b/packages/overlays/SysuiDarkThemeOverlay/Android.mk @@ -4,8 +4,6 @@ include $(CLEAR_VARS) LOCAL_RRO_THEME := SysuiDarkTheme LOCAL_CERTIFICATE := platform -LOCAL_SRC_FILES := $(call all-subdir-java-files) - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := SysuiDarkThemeOverlay