am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE" (e886392c) · Commits · e / os / android_build

core/clear_vars.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ LOCAL_UNSTRIPPED_PATH:=
		LOCAL_MODULE_CLASS:=
		LOCAL_MODULE_SUFFIX:=
		LOCAL_PACKAGE_NAME:=
		LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES:=
		LOCAL_OVERRIDES_PACKAGES:=
		LOCAL_EXPORT_PACKAGE_RESOURCES:=
		LOCAL_MANIFEST_PACKAGE_NAME:=
		@@ -95,6 +96,7 @@ LOCAL_COMPRESS_MODULE_SYMBOLS:=
		LOCAL_STRIP_MODULE:=
		LOCAL_JNI_SHARED_LIBRARIES:=
		LOCAL_JNI_SHARED_LIBRARIES_ABI:=
		LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS:=
		LOCAL_PREBUILT_JNI_LIBS:=
		LOCAL_JAR_MANIFEST:=
		LOCAL_INSTRUMENTATION_FOR:=

core/definitions.mk

+7 −4

Original line number	Diff line number	Diff line
		@@ -1837,7 +1837,7 @@ $(hide) mkdir -p $(addprefix $(dir $@)lib/,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI))
		$(foreach abi,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI),\
		$(call _add-jni-shared-libs-to-package-per-abi,$(abi),\
		$(patsubst $(abi):%,%,$(filter $(abi):%,$(PRIVATE_JNI_SHARED_LIBRARIES)))))
		$(hide) (cd $(dir $@) && zip -r $(notdir $@) lib)
		$(hide) (cd $(dir $@) && zip -r $(PRIVATE_JNI_SHARED_LIBRARIES_ZIP_OPTIONS) $(notdir $@) lib)
		$(hide) rm -rf $(dir $@)lib
		endef

		@@ -1865,12 +1865,15 @@ $(hide) java -jar $(SIGNAPK_JAR) \
		$(hide) mv $@.signed $@
		endef

		# Align STORED entries of a package on 4-byte boundaries
		# to make them easier to mmap.
		# Align STORED entries of a package on 4-byte boundaries to make them easier to mmap.
		#
		define align-package
		$(hide) mv $@ $@.unaligned
		$(hide) $(ZIPALIGN) -f 4 $@.unaligned $@.aligned
		$(hide) $(ZIPALIGN) \
		-f \
		$(if $(findstring true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p ,) \
		4 \
		$@.unaligned $@.aligned
		$(hide) mv $@.aligned $@
		endef

core/package_internal.mk

+11 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,14 @@ ifeq ($(LOCAL_MODULE_TAGS),)
		LOCAL_MODULE_TAGS := optional
		endif

		ifeq ($(LOCAL_PACKAGE_ALIGNMENT),)
		LOCAL_PACKAGE_ALIGNMENT := $(DEFAULT_PACKAGE_ALIGNMENT)
		endif

		ifeq ($(LOCAL_JNI_SHARED_LIBRARIES_PACKAGE_ALIGNMENT),)
		LOCAL_JNI_SHARED_LIBRARIES_PACKAGE_ALIGNMENT := $(DEFAULT_JNI_SHARED_LIBRARIES_PACKAGE_ALIGNMENT)
		endif

		ifeq ($(filter tests, $(LOCAL_MODULE_TAGS)),)
		# Force localization check if it's not tagged as tests.
		LOCAL_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) -z
		@@ -369,6 +377,8 @@ $(LOCAL_BUILT_MODULE): $(AAPT) \| $(ZIPALIGN)
		$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)
		# PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names.
		$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)
		$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ZIP_OPTIONS := $(LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS)
		$(LOCAL_BUILT_MODULE): PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES)
		ifneq ($(TARGET_BUILD_APPS),)
		# Include all resources for unbundled apps.
		LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
		@@ -491,7 +501,7 @@ $(apk_jni_stripped) : $(LOCAL_BUILT_MODULE) \| $(ZIPALIGN)
		@rm -rf $(dir $@) && mkdir -p $(dir $@)
		$(hide) cp $< $@
		$(hide) zip -d $@ $(foreach f,$(PRIVATE_JNI_SHARED_LIBRARIES),\*/$(f))
		$(call align-package)
		$(align-package)

		$(call dist-for-goals, apps_only, $(apk_jni_stripped):$(dist_subdir)/$(LOCAL_PACKAGE_NAME).apk)

core/prebuilt_internal.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ endif
		include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
		#######################################
		# Sign and align non-presigned .apks.
		$(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES)
		$(built_module) : $(my_prebuilt_src_file) \| $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR)
		$(transform-prebuilt-to-target)
		ifdef extracted_jni_libs

tools/zipalign/ZipAlign.cpp

+41 −13

Original line number	Diff line number	Diff line
		@@ -32,20 +32,39 @@ void usage(void)
		fprintf(stderr, "Zip alignment utility\n");
		fprintf(stderr, "Copyright (C) 2009 The Android Open Source Project\n\n");
		fprintf(stderr,
		"Usage: zipalign [-f] [-v] [-z] <align> infile.zip outfile.zip\n"
		" zipalign -c [-v] <align> infile.zip\n\n" );
		"Usage: zipalign [-f] [-p] [-v] [-z] <align> infile.zip outfile.zip\n"
		" zipalign -c [-v] <align> infile.zip [list of files]\n\n" );
		fprintf(stderr,
		" <align>: alignment in bytes, e.g. '4' provides 32-bit alignment\n");
		fprintf(stderr, " -c: check alignment only (does not modify file)\n");
		fprintf(stderr, " -f: overwrite existing outfile.zip\n");
		fprintf(stderr, " -p: page align stored shared object: files\n");
		fprintf(stderr, " -v: verbose output\n");
		fprintf(stderr, " -z: recompress using Zopfli\n");
		}

		static const int kPageAlignment = 4096;

		static int getAlignment(bool pageAlignSharedLibs, int defaultAlignment,
		ZipEntry* pEntry) {

		if (!pageAlignSharedLibs) {
		return defaultAlignment;
		}

		const char* ext = strrchr(pEntry->getFileName(), '.');
		if (ext && strcmp(ext, ".so") == 0) {
		return kPageAlignment;
		}

		return defaultAlignment;
		}

		/*
		* Copy all entries from "pZin" to "pZout", aligning as needed.
		*/
		static int copyAndAlign(ZipFile* pZin, ZipFile* pZout, int alignment, bool zopfli)
		static int copyAndAlign(ZipFile* pZin, ZipFile* pZout, int alignment, bool zopfli,
		bool pageAlignSharedLibs)
		{
		int numEntries = pZin->getNumEntries();
		ZipEntry* pEntry;
		@@ -75,13 +94,15 @@ static int copyAndAlign(ZipFile* pZin, ZipFile* pZout, int alignment, bool zopfl
		status = pZout->add(pZin, pEntry, padding, &pNewEntry);
		}
		} else {
		const int alignTo = getAlignment(pageAlignSharedLibs, alignment, pEntry);

		/*
		* Copy the entry, adjusting as required. We assume that the
		* file position in the new file will be equal to the file
		* position in the original.
		*/
		long newOffset = pEntry->getFileOffset() + bias;
		padding = (alignment - (newOffset % alignment)) % alignment;
		padding = (alignTo - (newOffset % alignTo)) % alignTo;

		//printf("--- %s: orig at %ld(+%d) len=%ld, adding pad=%d\n",
		// pEntry->getFileName(), (long) pEntry->getFileOffset(),
		@@ -105,7 +126,7 @@ static int copyAndAlign(ZipFile* pZin, ZipFile* pZout, int alignment, bool zopfl
		* output file exists and "force" wasn't specified.
		*/
		static int process(const char* inFileName, const char* outFileName,
		int alignment, bool force, bool zopfli)
		int alignment, bool force, bool zopfli, bool pageAlignSharedLibs)
		{
		ZipFile zin, zout;

		@@ -136,7 +157,7 @@ static int process(const char* inFileName, const char* outFileName,
		return 1;
		}

		int result = copyAndAlign(&zin, &zout, alignment, zopfli);
		int result = copyAndAlign(&zin, &zout, alignment, zopfli, pageAlignSharedLibs);
		if (result != 0) {
		printf("zipalign: failed rewriting '%s' to '%s'\n",
		inFileName, outFileName);
		@@ -147,7 +168,8 @@ static int process(const char* inFileName, const char* outFileName,
		/*
		* Verify the alignment of a zip archive.
		*/
		static int verify(const char* fileName, int alignment, bool verbose)
		static int verify(const char* fileName, int alignment, bool verbose,
		bool pageAlignSharedLibs)
		{
		ZipFile zipFile;
		bool foundBad = false;
		@@ -172,11 +194,12 @@ static int verify(const char* fileName, int alignment, bool verbose)
		}
		} else {
		long offset = pEntry->getFileOffset();
		if ((offset % alignment) != 0) {
		const int alignTo = getAlignment(pageAlignSharedLibs, alignment, pEntry);
		if ((offset % alignTo) != 0) {
		if (verbose) {
		printf("%8ld %s (BAD - %ld)\n",
		(long) offset, pEntry->getFileName(),
		offset % alignment);
		offset % alignTo);
		}
		foundBad = true;
		} else {
		@@ -204,6 +227,7 @@ int main(int argc, char* const argv[])
		bool force = false;
		bool verbose = false;
		bool zopfli = false;
		bool pageAlignSharedLibs = false;
		int result = 1;
		int alignment;
		char* endp;
		@@ -233,6 +257,9 @@ int main(int argc, char* const argv[])
		case 'z':
		zopfli = true;
		break;
		case 'p':
		pageAlignSharedLibs = true;
		break;
		default:
		fprintf(stderr, "ERROR: unknown flag -%c\n", *cp);
		wantUsage = true;
		@@ -260,14 +287,15 @@ int main(int argc, char* const argv[])

		if (check) {
		/* check existing archive for correct alignment */
		result = verify(argv[1], alignment, verbose);
		result = verify(argv[1], alignment, verbose, pageAlignSharedLibs);
		} else {
		/* create the new archive */
		result = process(argv[1], argv[2], alignment, force, zopfli);
		result = process(argv[1], argv[2], alignment, force, zopfli, pageAlignSharedLibs);

		/* trust, but verify */
		if (result == 0)
		result = verify(argv[2], alignment, verbose);
		if (result == 0) {
		result = verify(argv[2], alignment, verbose, pageAlignSharedLibs);
		}
		}

		bail: