diff options
| author | Ihor Ivanov <toulmee@gmail.com> | 2021-09-26 19:55:41 +0300 |
|---|---|---|
| committer | Nolen Johnson <johnsonnolen@gmail.com> | 2022-03-14 16:46:01 -0400 |
| commit | 85f1e8676625767ec0f6b46678ed2be979e040fb (patch) | |
| tree | 14448e711ee1ec7a1fee975ee6c5c74ef4ad9618 | |
| parent | 9607717f4df6157d275d23fb26a1539368976053 (diff) | |
beckham: Move MotCamera2 back to Android.bp
Since JNI libs were separated from APK file,
there is no need for Android.mk anymore.
Signed-off-by: Ihor Ivanov <toulmee@gmail.com>
Change-Id: I79bb1ff4a7f033cd7611c12503db03acf749f67c
| -rwxr-xr-x | setup-makefiles.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/setup-makefiles.sh b/setup-makefiles.sh index cbc463d..5ac575d 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -6,34 +6,8 @@ # SPDX-License-Identifier: Apache-2.0 # -function write_motcam_androidmk() { - # Move MotCamera2 back to Android.mk to prevent JNI build-system from - # messing with pre-packed JNI dependencies - cat << EOF >> "$ANDROIDMK" -include \$(CLEAR_VARS) -LOCAL_MODULE := MotCamera2 -LOCAL_MODULE_OWNER := motorola -LOCAL_SRC_FILES := proprietary/system/priv-app/MotCamera2/MotCamera2.apk -LOCAL_CERTIFICATE := PRESIGNED -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) - -EOF - - sed -i '/MotCamera2/,+10d' "${ANDROID_ROOT}/vendor/${VENDOR}/${DEVICE}/Android.bp" -} - set -e -export -f write_motcam_androidmk -export USES_MOTCAMERA=true - export DEVICE=beckham export DEVICE_COMMON=sdm660-common export VENDOR=motorola |