Move Camera2 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

diff --git a/Android.mk b/Android.mk
index 879692e..f5f1ead 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,8 @@ LOCAL_PACKAGE_NAME := Camera2
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_PRODUCT_MODULE := true
+
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 # Guava uses deprecated org.apache.http.legacy classes.

diff --git a/CleanSpec.mk b/CleanSpec.mk
index dd945b0..8df8308 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,8 +43,9 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Camera2)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_tinyplanet.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_jpegutil.so)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

diff --git a/jni/Android.mk b/jni/Android.mk
index 6798594..df99900 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -8,6 +8,7 @@ LOCAL_LDFLAGS   := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 17
 LOCAL_MODULE    := libjni_tinyplanet
 LOCAL_SRC_FILES := tinyplanet.cc
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
 LOCAL_CFLAGS += -Wall -Wextra -Werror
@@ -22,6 +23,7 @@ LOCAL_NDK_STL_VARIANT := c++_static
 LOCAL_LDFLAGS   := -llog -ldl -ljnigraphics
 LOCAL_SDK_VERSION := 17
 LOCAL_MODULE    := libjni_jpegutil
+LOCAL_PRODUCT_MODULE := true
 LOCAL_SRC_FILES := jpegutil.cpp jpegutilnative.cpp
 
 LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk