aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNolen Johnson <johnsonnolen@gmail.com>2021-08-23 12:56:42 -0400
committerNolen Johnson <johnsonnolen@gmail.com>2022-03-14 16:46:01 -0400
commitfb639e4af50c60831a5ad1e86abef7b93aa6404d (patch)
treeb15a4a59901a14b5d8fbf174c3ba8912834c5064
parentb571345ba26f71bf85d6e9e0b7d594e0a2f9d35d (diff)
beckham: Override Camera2 here instead of via remove_packages
* Already hand-writing Android.mk, so why not. Change-Id: I0bd7b31968ba074b50d88a8abaca8bac07f6b034
-rw-r--r--device.mk4
-rw-r--r--remove_packages/Android.mk11
-rwxr-xr-xsetup-makefiles.sh1
3 files changed, 1 insertions, 15 deletions
diff --git a/device.mk b/device.mk
index 142c53e..7650942 100644
--- a/device.mk
+++ b/device.mk
@@ -83,10 +83,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
-# Remove unwanted packages
-PRODUCT_PACKAGES += \
- RemovePackages
-
# Sensors
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf \
diff --git a/remove_packages/Android.mk b/remove_packages/Android.mk
deleted file mode 100644
index 35ee8c2..0000000
--- a/remove_packages/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := RemovePackages
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_OVERRIDES_PACKAGES := Snap
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_SRC_FILES := /dev/null
-include $(BUILD_PREBUILT)
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 762c776..cbc463d 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -19,6 +19,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := APPS
LOCAL_DEX_PREOPT := false
LOCAL_MODULE_SUFFIX := .apk
+LOCAL_OVERRIDES_PACKAGES := Camera2
LOCAL_PRIVILEGED_MODULE := true
LOCAL_REPLACE_PREBUILT_APK_INSTALLED := \$(LOCAL_PATH)/\$(LOCAL_SRC_FILES)
include \$(BUILD_PREBUILT)