Merge "Add support for JNI libraries to soong_app_prebuilt.mk" (9cda85eb) · Commits · e / os / android_build

core/clear_vars.mk

+2 −0

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,25 @@ else
	$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
	endif		endif

			# embedded JNI will already have been handled by soong
			my_embed_jni :=
			my_prebuilt_jni_libs :=
			ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH)
			my_2nd_arch_prefix :=
			LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH))
			include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
			endif
			ifdef TARGET_2ND_ARCH
			ifdef LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH)
			my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
			LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH))
			include $(BUILD_SYSTEM)/install_jni_libs_internal.mk
			endif
			endif
			LOCAL_SHARED_JNI_LIBRARIES :=
			my_embed_jni :=
			my_prebuilt_jni_libs :=
			my_2nd_arch_prefix :=

	PACKAGES := $(PACKAGES) $(LOCAL_MODULE)		PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
	ifdef LOCAL_CERTIFICATE		ifdef LOCAL_CERTIFICATE

Original line number	Original line	Diff line number	Diff line
	@@ -318,6 +318,7 @@ LOCAL_PACK_MODULE_RELOCATIONS_$(TARGET_ARCH):=
	LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):=		LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):=
	LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):=		LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):=		LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):=
			LOCAL_SOONG_JNI_LIBS_$(TARGET_ARCH):=
	LOCAL_SRC_FILES_EXCLUDE_$(TARGET_ARCH):=		LOCAL_SRC_FILES_EXCLUDE_$(TARGET_ARCH):=
	LOCAL_SRC_FILES_$(TARGET_ARCH):=		LOCAL_SRC_FILES_$(TARGET_ARCH):=
	LOCAL_STATIC_LIBRARIES_$(TARGET_ARCH):=		LOCAL_STATIC_LIBRARIES_$(TARGET_ARCH):=
	@@ -340,6 +341,7 @@ LOCAL_PACK_MODULE_RELOCATIONS_$(TARGET_2ND_ARCH):=
	LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):=		LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):=
	LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):=		LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(TARGET_2ND_ARCH):=		LOCAL_SHARED_LIBRARIES_$(TARGET_2ND_ARCH):=
			LOCAL_SOONG_JNI_LIBS_$(TARGET_2ND_ARCH):=
	LOCAL_SRC_FILES_EXCLUDE_$(TARGET_2ND_ARCH):=		LOCAL_SRC_FILES_EXCLUDE_$(TARGET_2ND_ARCH):=
	LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=		LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=
	LOCAL_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):=		LOCAL_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):=