From a8f45e991431ba29df8b407731d1e1eedce1f2e3 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 21 Nov 2019 15:50:28 +0000 Subject: [PATCH] Revert "lineage: add BUILD_RRO_SYSTEM_PACKAGE target" AOSP pushes RROs to system by default now, therefore our custom target is not needed anymore. This reverts commit 546c9a1ec50392d77851302742a7f338a8426cad. Change-Id: I46753a3b60a89f0198058fbc6d07d3db8a6699b5 --- build/core/config.mk | 2 -- build/core/system_rro.mk | 28 ---------------------------- 2 files changed, 30 deletions(-) delete mode 100644 build/core/system_rro.mk diff --git a/build/core/config.mk b/build/core/config.mk index 3bf8e2c0..f2e595ff 100644 --- a/build/core/config.mk +++ b/build/core/config.mk @@ -20,7 +20,5 @@ FRAMEWORK_LINEAGE_PLATFORM_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_current. FRAMEWORK_LINEAGE_PLATFORM_REMOVED_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_removed.txt FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt -BUILD_RRO_SYSTEM_PACKAGE := $(TOPDIR)vendor/lineage/build/core/system_rro.mk - # Rules for QCOM targets include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk diff --git a/build/core/system_rro.mk b/build/core/system_rro.mk deleted file mode 100644 index 9b1257a9..00000000 --- a/build/core/system_rro.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2018 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true - -ifneq ($(LOCAL_SRC_FILES),) - $(error runtime resource overlay package should not contain sources) -endif - -ifeq ($(LOCAL_RRO_THEME),) - $(error runtime resource overlay package must define \'LOCAL_RRO_THEME\') -else - LOCAL_MODULE_PATH := $(TARGET_OUT)/app/$(LOCAL_RRO_THEME) -endif - -include $(BUILD_SYSTEM)/package.mk -