OSDN Git Service

Don't extract jni from prebuilt apks.
authorYing Wang <wangying@google.com>
Fri, 1 May 2015 21:02:26 +0000 (14:02 -0700)
committerYing Wang <wangying@google.com>
Tue, 2 Jun 2015 02:19:45 +0000 (19:19 -0700)
commit1fb0152ff7bf24b565b44a57e51290f2a5430107
treeb4fc6334c2e8d36ac8658b542c345e81b15da8b0
parent4fe7bfd373d99dedfd2e63135da5189478bb0138
Don't extract jni from prebuilt apks.

- We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always
  page-align jni shared libraries and store them umcompressed.
- For prebuilt apks, we don't extract jni any more; Instead we always run
  uncompress-shared-libs on them.
- For apks built from source, we still install the jni separately, because
  that way multiple apks can share the same jni and it saves space.

With this change, for most prebuilt apks, we don't need to specify
LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build
system automatically replaces the embedded jni with uncompressed files;
But if a prebuilt is a fat apk (i.e. containing jni not needed by the
current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to
specify what jni to keep. Otherwise all embedded jni will be replaced with
uncompressed files, that wastes space.

Bug: 8076853
Change-Id: Ic3666dc72bf17cd293787414dd185470b365f967
core/clear_vars.mk
core/definitions.mk
core/install_jni_libs.mk
core/install_jni_libs_internal.mk
core/package_internal.mk
core/prebuilt_internal.mk