summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-01-11 14:47:39 +0000
committerMichael Bestas <mkbestas@lineageos.org>2020-05-09 00:22:08 +0300
commit813ca62f1411b07ab39d8f7fe2be8224ce698214 (patch)
tree43e62203f8bdff2909f279e314a3fd0aaae3570c
parentbda901371dd328d0d31a51e2c7c2ba428cba2bcb (diff)
downloadandroid_packages_apps_Snap-813ca62f1411b07ab39d8f7fe2be8224ce698214.zip
android_packages_apps_Snap-813ca62f1411b07ab39d8f7fe2be8224ce698214.tar.gz
android_packages_apps_Snap-813ca62f1411b07ab39d8f7fe2be8224ce698214.tar.bz2
Move Snap and its libs to /product
This app is frequently overriden by proprietary apps on shipping devices, so move it to /product along with its jni libs. Bug: 122353713 Test: launch camera on aosp_arm64 emulator Change-Id: Ia6453e71cc93ea545f4ef3e9b609dff3f0e42243
-rw-r--r--Android.mk5
-rw-r--r--jni/Android.mk3
2 files changed, 7 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index bdf1807..e0cd6f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,6 +48,8 @@ LOCAL_RENDERSCRIPT_TARGET_API := 23
LOCAL_OVERRIDES_PACKAGES := Camera2
+LOCAL_PRODUCT_MODULE := true
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# If this is an unbundled build (to install separately) then include
@@ -68,7 +70,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := privapp_whitelist_org.lineageos.snap.xml
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
+LOCAL_PRODUCT_MODULE := true
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
diff --git a/jni/Android.mk b/jni/Android.mk
index 81329a0..c813453 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -47,6 +47,7 @@ LOCAL_LDFLAGS := -llog -lGLESv2
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjni_snapmosaic
+LOCAL_PRODUCT_MODULE := true
include $(BUILD_SHARED_LIBRARY)
# TinyPlanet
@@ -56,6 +57,7 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_LDFLAGS := -llog -ljnigraphics
LOCAL_SDK_VERSION := 9
LOCAL_MODULE := libjni_snaptinyplanet
+LOCAL_PRODUCT_MODULE := true
LOCAL_SRC_FILES := tinyplanet.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
@@ -69,6 +71,7 @@ LOCAL_LDFLAGS := -llog
LOCAL_SDK_VERSION := 9
LOCAL_MODULE := libjni_snapimageutil
LOCAL_MODULE_TAGS := optional
+LOCAL_PRODUCT_MODULE := true
LOCAL_SRC_FILES := image_util_jni.cpp
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
include $(BUILD_SHARED_LIBRARY)