diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-08-30 16:42:15 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-30 16:42:16 -0700 |
| commit | 3f1353f8b4eea8329cf90a2650eff25e70795fb9 (patch) | |
| tree | c49f712dd7ea9b20cd8bc124cec5f996474d4de8 | |
| parent | fd7b0bcb281e2a775a1099ffb1e4419a8578853b (diff) | |
| parent | 2990ae27b397e7e7b1add2be50df810a3c86f45e (diff) | |
| download | sdk-3f1353f8b4eea8329cf90a2650eff25e70795fb9.zip sdk-3f1353f8b4eea8329cf90a2650eff25e70795fb9.tar.gz sdk-3f1353f8b4eea8329cf90a2650eff25e70795fb9.tar.bz2 | |
Merge "Let ApkBuilder package bitcode library into APK."
| -rw-r--r-- | sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java index 626e61f..f5abe9e 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java @@ -51,6 +51,8 @@ public final class ApkBuilder implements IArchiveBuilder { private final static Pattern PATTERN_NATIVELIB_EXT = Pattern.compile("^.+\\.so$", Pattern.CASE_INSENSITIVE); + private final static Pattern PATTERN_BITCODELIB_EXT = Pattern.compile("^.+\\.bc$", + Pattern.CASE_INSENSITIVE); /** * A No-op zip filter. It's used to detect conflicts. @@ -125,7 +127,7 @@ public final class ApkBuilder implements IArchiveBuilder { mAddedFiles.put(archivePath, mInputFile); } - if (archivePath.endsWith(".so")) { + if (archivePath.endsWith(".so") || archivePath.endsWith(".bc")) { mNativeLibs.add(archivePath); // only .so located in lib/ will interfere with the installation @@ -677,6 +679,7 @@ public final class ApkBuilder implements IArchiveBuilder { // are gdbserver executables if (lib.isFile() && (PATTERN_NATIVELIB_EXT.matcher(lib.getName()).matches() || + PATTERN_BITCODELIB_EXT.matcher(lib.getName()).matches() || (mDebugMode && SdkConstants.FN_GDBSERVER.equals( lib.getName())))) { @@ -751,6 +754,7 @@ public final class ApkBuilder implements IArchiveBuilder { // are gdbserver executables if (lib.isFile() && (PATTERN_NATIVELIB_EXT.matcher(lib.getName()).matches() || + PATTERN_BITCODELIB_EXT.matcher(lib.getName()).matches() || (debugMode && SdkConstants.FN_GDBSERVER.equals( lib.getName())))) { |