Commit Graph

7241 Commits

Author SHA1 Message Date
Dimitry Ivanov 72bced8a75 Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 18:33:00 +00:00
Narayan Kamath cf7fbcd03d Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.

Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.

bug: 20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
2015-06-04 10:50:52 +00:00
Yohann Roussel a9dd74c395 Merge "Add support for RMTYPEDEF with Jack" into mnc-dev 2015-06-02 09:36:27 +00:00
Ying Wang 226eb92321 Uncompress .so files before signing the apk.
- In uncompress-shared-libs we may strip .so files not for the current
  TARGET_ARCH. So we need to strip first and then sign the apk.
- For PRESIGNED apks, make sure we don't strip the .so files even if
   they are "fat".

Bug: 21571418
Bug: 8076853
Change-Id: Ifd1193dda0c2cd52ac148064ce5a32bcdd03f75c
2015-06-01 19:19:57 -07:00
Ying Wang 1fb0152ff7 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
2015-06-01 19:19:45 -07:00
Andrew Hsieh d760d4676b Revert "Revert "Enable linker -fix-cortex-a53-843419""
This reverts commit 32e1689684.

Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated

Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
2015-06-02 07:59:24 +08:00
Ying Wang 4fe7bfd373 Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.

Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
2015-06-01 10:43:29 -07:00
Chih-Hung Hsieh ad2494bb79 Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.

BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
2015-05-29 10:27:58 -07:00
Yohann Roussel 5b2c6e26db Add support for RMTYPEDEF with Jack
Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-05-28 18:10:03 +02:00
Ying Wang 45c8b574b6 am b5f59372: am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit 'b5f5937280ef2d561d84be7f52d91a8dbecb87ef':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:40:49 +00:00
Ying Wang b5f5937280 am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '30a411f0f61dd74fb870fb97b8d2129dbfb85024':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:24:19 +00:00
Ying Wang 58b3ee2863 am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '12f449756587b83cd6a04c793e05b837ceb41563':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:32:41 +00:00
Ying Wang 12f4497565 Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07:00
Patrick Tjin 899717ff2a Add huawei to vendor owner whitelist [DO NOT MERGE]
Change-Id: I4996eeb43e414f327e6e9b52564044771bfbc1c3
(cherry picked from commit 7f6fb274b7)
2015-05-27 03:31:38 +00:00
Kris Giesing f93d8dd6c2 Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev 2015-05-22 18:58:18 +00:00
Jose Lima b222b6e62c Add recommendation suport library to build
Change-Id: Ica884fa2bae30979dd7d17b18a004459ad161da3
2015-05-21 16:27:15 -07:00
Adam Powell 0d007cf6d0 Merge "Initialize ro.build.version.preview_sdk" into mnc-dev 2015-05-21 22:17:41 +00:00
Adam Powell bdd5e8e7fe Initialize ro.build.version.preview_sdk
Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
2015-05-21 13:49:05 -07:00
Ying Wang a6ffb929f4 FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Because we don't have 32-bit prebuilt libLLVM/libclang.

Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
(cherry picked from commit e5d4e74f9f)
2015-05-19 22:34:40 -07:00
Ying Wang 69425c1dcb am 44acba6d: am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '44acba6d37b1d13ef3a3ec6d89e5121f691089d9':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:15:47 +00:00
Ying Wang 44acba6d37 am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '02026edf4d104750fde070862636d29db4124b3a':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:03:22 +00:00
Ying Wang bf6b82fbf1 am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '247f5c4fce9e2cf1911458be1591517c1e7dbc42':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:39:27 +00:00
Ying Wang 247f5c4fce am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:28:37 +00:00
Ying Wang 1bd155692f am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit 'e528e44d31498ad83482b1860036916d0fded379':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:11:27 +00:00
Ying Wang e528e44d31 Merge "Add task to print transitive dependencies and their license files." into lmp-dev 2015-05-19 23:58:47 +00:00
Ying Wang a1ea202256 Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
  $ make deps-license packages/app/% external/%
  prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".

Bug: 20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from 39b9b690a8)
2015-05-19 16:37:42 -07:00
Ying Wang 589e8c52fb Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
  TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
  dir.

Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Yohann Roussel 0a0b640f50 Merge "Save Jack default extra args in a file" into mnc-dev 2015-05-19 09:27:43 +00:00
Siva Velusamy 70b67accbf Don't exclude GPL binaries from the emulator system image
GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
2015-05-18 23:14:18 +00:00
Yohann Roussel b6bfb5893a Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Vince Harron a48c74fb3d Improved/clarified license guidance for GPL code.
This messaging approved by Google Open Source Licensing.

Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
2015-05-15 17:01:01 -07:00
Filip Gruszczynski 8eade31f98 am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '7fbb988da154ad91461c3d51994ae0ff99d94032':
  Add percent library to support libraries build.
2015-05-13 23:46:29 +00:00
dcashman c0ba40b8a1 Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev 2015-05-13 18:38:18 +00:00
dcashman 49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

(cherry-pick of commit: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
Bart Sears 0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Dan Albert 93f22ee7e2 Merge "Disallow using stlport." into mnc-dev 2015-05-12 23:11:10 +00:00
Evgeniy Stepanov 04cfb9e113 Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-dev
* changes:
  --no-as-needed needs -Wl.
  Fix AddressSanitizer link order and multilib setup.
  Make asan more closely match clang behavior.
2015-05-12 22:34:16 +00:00
Dan Albert bdd8ca0604 --no-as-needed needs -Wl.
Not sure why my checkbuild passed.

Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
2015-05-12 14:04:55 -07:00
Evgenii Stepanov 6708b6c99c Fix AddressSanitizer link order and multilib setup.
ASan runtime library (when using dynamic linking) must be the first
dependency of the main executable to achieve correct symbol
interposition. This matches how the clang driver works.

In multilib setup, ASan-RT name depends on the target arch:
  /system/lib/libclang_rt.asan-arm-android.so
  /system/lib64/libclang_rt.asan-arm64-android.so

We also set RPATH to /system/lib/asan or /system/lib64/asan
to have a place for ASan-only versions of system libraries.

Change-Id: I937d202077b6e433ba476c075d31be818b662d53
2015-05-12 13:40:29 -07:00
Dan Albert eebb800170 Make asan more closely match clang behavior.
Always link libm with asan. Hasn't been a problem before because ASAN
was only ever used when libc++ was as well, which already links libm.

Pass --no-as-needed for host modules.

These aren't needed for the target builds because the target uses the
shared RTL.

Change-Id: I3b95c8682c0f63bac6b726f8cd15c638aaa98311
2015-05-12 13:40:26 -07:00
Ying Wang 480a9bb64e Keep Throwable's constructor that takes a String argument.
Bug: 20495321
Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
2015-05-11 14:56:20 -07:00
Filip Gruszczynski 8c97e1782b Add percent library to support libraries build.
Change-Id: I8d54f4249f609032fde1d015900204e284fc0c60
2015-05-11 11:58:01 -07:00
Andres Morales 821a554c1b Merge "[versionitis] pull image id from recovery into props" into mnc-dev 2015-05-08 22:04:27 +00:00
Andres Morales b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Ying Wang 90598cb70c Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
2015-05-08 13:27:25 -07:00
Ying Wang d508778493 Merge "Revert "Fix and cleanup."" into mnc-dev 2015-05-08 18:51:22 +00:00
Ying Wang 884738e4a6 Revert "Fix and cleanup."
This reverts commit f28bad5227.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
2015-05-08 18:51:00 +00:00
Ying Wang 22571e1857 Merge "Fix and cleanup." into mnc-dev 2015-05-08 18:11:55 +00:00
Dan Albert 0a4122a4f2 Disallow using stlport.
The only remaining users of stlport are vendor blobs. Prevent any new
users from using it.

Bug: http://b/15193147
Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
(cherry picked from commit 3a360a7353)
2015-05-08 09:56:48 -07:00
Ying Wang 1af02e6116 Merge "Fix Mac build." into mnc-dev 2015-05-08 03:59:15 +00:00
Ying Wang b4b767a484 Fix Mac build.
Mac doesn't like "cp -r -L", but "cp -R -L".

Change-Id: I32bd8e5171db4ed811e158d91482671b14622825
2015-05-07 20:57:56 -07:00
Ying Wang f28bad5227 Fix and cleanup.
- Detect java-source-list before transforming to java-source-list-uniq.
  This fixes non-fatal errors in build log like:
  /bin/bash:
  out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list:
  No such file or directory
- Cleaned the outdated incrementaljavac. Nobody is using this feature
  and now we switched to jack.

Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
2015-05-07 16:53:13 -07:00
Dmitriy Ivanov f55c5a52ac Do not pack relocations for executables
Bug: http://b/20665974
Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67
(cherry picked from commit e24b6f77ff)
2015-05-07 14:12:00 -07:00
Yigit Boyar 8c7121de86 Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-dev 2015-05-07 01:40:10 +00:00
Yigit Boyar fa358f7228 DO NOT MERGE Remove RecyclerView tests form pathmap
Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae37)
2015-05-07 01:13:53 +00:00
Jeff Brown 64434af772 Revert "Build docs for android-support-media-protocols.jar."
This reverts commit 5d0da1f959.

Bug: 20641986
Change-Id: I68d79186179b8b542b323ab630c6ed7620eb6f27
2015-05-06 16:02:20 -07:00
Chih-Hung Hsieh 0ba68bafa3 Upgrade x86 gcc to 4.9 and disable devirtualization.
Also filter out gcc-only flags -Wno-clobbered and -fno-devirtualize
when compiled with clang/llvm.

BUG: 19872411
Change-Id: I6de57583be04da607f569df65e93531787dbb789
(cherry picked from AOSP commit 90036610dd)
2015-05-06 00:24:18 +00:00
Ying Wang 4f5d0e60b4 Raise SDK version for ProGuard processing when app links support library.
When an app's LOCAL_SDK_VERSION is lower than the support library's
LOCAL_SDK_VERSION,  we artifically raises the "SDK version" "linked"
by ProGuard, to
- suppress ProGuard warnings of referencing symbols unknown to the
  lower SDK version.
- prevent ProGuard stripping subclass in the support library that
  extends class added in the higher SDK version.

This allows us to remove the dangerous ProGuard flag
"-dontwarn android.support.**".

Notes:
- We don't raise the app's LOCAL_SDK_VERSION, so that the app's own
  code is still unable to use the higher SDK version.
- For platform build, we can't just raise to the "current" SDK,
  because would break apps that use APIs removed from the current SDK.
  We raise it to framework.jar instead, which contains the most complete
  symbol set.

Bug: 20658265
Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7
(cherry picked from commit 8e8d1e7aba)
2015-05-05 17:35:12 +00:00
Yigit Boyar a417909fde Remove RecyclerView tests form pathmap
Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae37)
2015-05-04 23:15:23 +00:00
Dmitriy Ivanov 258b29cf76 Pack module before making symbolic version
We need PT_LOAD segments to match for the gdb sake.
  If we pack module after stripping symbolic version
  PT_LOAD differ from actual ones; this confuses gdb.

Bug: http://b/20687795
Change-Id: If7b1ffcda918d0cc47051a30ca1202007ed62403
2015-05-04 12:42:51 -07:00
Ying Wang 069f1f8942 Deference symlinks when copying LOCAL_PICKUP_FILES.
Change-Id: I2399529ee9168bb93a4cad5daa61cd2ea500df04
2015-04-30 19:46:00 -07:00
Ying Wang ffe376b49e Fix jack transformation on prebuilt AAR.
Change-Id: I74f932cff606138943d97b923bbd059bcd496e46
2015-04-30 09:55:08 -07:00
Dmitriy Ivanov 5924f142cc Revert "Revert "Pack relocations for mips64""
This reverts commit 6399dcce59.

Bug: http://b/20658994
(cherry picked from commit 8387d99ec3)
2015-04-29 23:11:03 -07:00
Dmitriy Ivanov 0cabfed78e Revert "Revert "Pack relocations for mips""
This reverts commit d05fd6fc82.

Bug: http://b/20658994
Change-Id: Iccbd4846b310306ed11b87f4566b8aaadfa63ebb
(cherry picked from commit cb2b3d47ad)
2015-04-29 15:44:20 -07:00
Dimitry Ivanov 8fb3350f1a Merge "Revert "Pack relocations for mips"" into mnc-dev 2015-04-29 19:37:46 +00:00
Dimitry Ivanov d896883bfe Revert "Pack relocations for mips"
This reverts commit 9dc1a7359f.

Bug: http://b/20658994
Change-Id: Ib10c764a7d06db823ee2fccfa47240e0a639d4bc
(cherry picked from commit d05fd6fc82)
2015-04-29 12:33:19 -07:00
Dimitry Ivanov 3e037e36d0 Revert "Pack relocations for mips64"
This reverts commit 8bd30fe3cb.

Bug: http://b/20658994
Change-Id: I6c31094559a12b824344802bf3993f91aee79a26
(cherry picked from commit 6399dcce59)
2015-04-29 12:32:27 -07:00
Chris Banes 0e8383ca6f am 8f168d1b: Add design support library docs
* commit '8f168d1b986516112d103958070830c9075f6ce2':
  Add design support library docs
2015-04-29 09:17:22 +00:00
Chris Banes 8f168d1b98 Add design support library docs
BUG: 20524332
Change-Id: I471ab17a2a5ccc43f4ef0fa04b7c2e9077d56361
2015-04-28 12:01:49 +01:00
Elliott Hughes 4091bdb168 am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '6e40faa241b241f1c32edb40d36f9c407d8f6790':
  Fix a trivial comment typo.
2015-04-25 18:44:03 +00:00
Elliott Hughes 449849513b am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '162e19061c7fcdf9e212a561f75427cf1126ea67':
  Fix a trivial comment typo.
2015-04-25 18:23:50 +00:00
Elliott Hughes b271669a0c Merge "Fix a trivial comment typo." 2015-04-25 18:04:21 +00:00
Elliott Hughes ae1d4b0d18 Fix a trivial comment typo.
Bug: https://code.google.com/p/android/issues/detail?id=170069
Change-Id: Iacd308893561a991971b191d4d10a78ca82753d4
2015-04-25 11:02:40 -07:00
Nick Kralevich b126ae9e3a am c98d6b35: am 6612d4a0: am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'c98d6b35ba7e9381089b1b7c8b47f384e5772a4f':
  host compiler: enable compiler hardening flags
2015-04-25 05:15:48 +00:00
Nick Kralevich 6612d4a088 am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'edc3371aeaf0f963d95b4d8bfb0e35b8b17ee648':
  host compiler: enable compiler hardening flags
2015-04-25 04:54:12 +00:00
Nick Kralevich 100acd1001 host compiler: enable compiler hardening flags
Enable the following compiler hardening flags:

* -Wl,-z,relro
* -Wl,-z,now
* -fstack-protector

relro / bind_now make the relro region read-only after linking,
preventing certain attacks against ELF data structures.

stack-protector adds stack canaries, which can detect exploits
which overwrite parts of the stack.

Explicitly not added in this change is FORTIFY_SOURCE=2. Adding that
option turns on glibc's warn_unused_result attributes. This generates
a huge number of new compile time warnings, and for the multiple
makefiles which have -Werror in them, turns those warnings into errors.
I'm not able to fix all the errors right away.

Bug: 20558757
Change-Id: I86791177c6695f5325233d9dd9a5dd3ccc2b1a2f
2015-04-24 21:26:08 -07:00
Dmitriy Ivanov 0be46e11a6 am 80421984: am aac1b9d9: am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit '804219841d7f581cf78f3f68e13381b6631513a0':
  Pack relocations for mips64
2015-04-25 00:31:30 +00:00
Dmitriy Ivanov aac1b9d9bf am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit 'f674a67d6ef3d446dd726ce9600bd905815506b6':
  Pack relocations for mips64
2015-04-25 00:09:51 +00:00
Dmitriy Ivanov 155d7cc845 am 7347196a: am df7afb47: am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '7347196acbf640caaf68e4e790489a40d770a083':
  Do not pack relocations for prebuilts by default
2015-04-24 23:36:21 +00:00
Dmitriy Ivanov 8bd30fe3cb Pack relocations for mips64
Bug: http://b/18051137
Change-Id: I063c5d6cf007658c0efe9cb1d65ed8026b3e7dae
2015-04-24 16:34:09 -07:00
Dmitriy Ivanov df7afb47d8 am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '3b023915e8374341c6a69cd40b0811e10b3cb1b5':
  Do not pack relocations for prebuilts by default
2015-04-24 23:14:00 +00:00
Dmitriy Ivanov 4fa4e4befd Merge "Do not pack relocations for prebuilts by default" 2015-04-24 22:56:08 +00:00
Dmitriy Ivanov 64762c3027 Do not pack relocations for prebuilts by default
Do not pack relocations for prebuilds unless
 LOCAL_PACK_MODULE_RELOCATIONS is true

Bug: http://b/20537715
Bug: http://b/18051137
Change-Id: Iddef3b09741da6ae10d73c98103b868cc7695d38
2015-04-24 15:33:14 -07:00
Dmitriy Ivanov a705b5651d am 10537b6f: am 513be561: am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit '10537b6f41342c50fc0c80bd85ff1b126054086f':
  Pack relocations for mips
2015-04-24 21:09:38 +00:00
Dmitriy Ivanov 513be561e9 am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit 'cae4652514c220d1b8d9fbbdca1204bc6cb25954':
  Pack relocations for mips
2015-04-24 20:05:03 +00:00
Dmitriy Ivanov 9dc1a7359f Pack relocations for mips
Bug: http://b/18051137
Change-Id: Id5e0adfb55273f23e1c99b4eecb318c6b8d19989
2015-04-24 12:20:02 -07:00
Dmitriy Ivanov d96e487b9b am 5754ad7e: am 5c327ec3: am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '5754ad7ead23fb613f9fe4de2970283d18141ea5':
  Pack relocations for x86
2015-04-24 18:28:05 +00:00
Dmitriy Ivanov 5c327ec39c am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '0f7ecd648bd5aa7f2798615559eb2cfd72e5d918':
  Pack relocations for x86
2015-04-24 18:07:03 +00:00
Dmitriy Ivanov b1c2727aec Merge "Pack relocations for x86" 2015-04-24 17:44:09 +00:00
Dmitriy Ivanov 1d4804ccd1 Pack relocations for x86
Bug: http://b/18051137
Change-Id: I3f316343e9bbd2037a9583d5b6fb41a06be153cd
2015-04-24 10:34:59 -07:00
Dmitriy Ivanov 7fa5ba1d22 am 6a2b812b: am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit '6a2b812b8cc5ac7ea051d2c09651e12d08217919':
  Disable packed relocations for NDK builds
2015-04-24 05:30:47 +00:00
Dmitriy Ivanov cda3d43345 am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit 'eacc8a052f30fc78a9b593a8b7bd4f0f8f5eb7d3':
  Disable packed relocations for NDK builds
2015-04-24 05:10:51 +00:00
Dmitriy Ivanov 3b51f20be9 Disable packed relocations for NDK builds
Bug: http://b/20537715
Change-Id: I1289a88d5eb694980b026b695cb25edd8ba76ed5
2015-04-23 18:55:23 -07:00
Dmitriy Ivanov be55caf288 am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '6f2935dc1432a38e149498b6efbd43ed9aceb827':
  Pack relocation tables for dynamic executables
2015-04-23 23:16:36 +00:00
Dmitriy Ivanov dabf96ab0a am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit 'c84b3a781c0065cba994e8cdd49b6bdb51e93399':
  Pack relocation tables for dynamic executables
2015-04-23 22:35:01 +00:00
Dmitriy Ivanov 4c2d1a64fb Pack relocation tables for dynamic executables
Add replocation-packer step for dynmic executables.

  Enable it by default for arm and arm64 platforms.

Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
2015-04-23 12:07:16 -07:00
Dimitry Ivanov bc83d0bb68 am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '893ed24dd7cec9b560fe46862b3635efa327ec65':
  Revert "Pack relocation tables for all dynamic executables"
2015-04-23 05:07:11 +00:00
Dimitry Ivanov 387a9fee53 am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '941d61decc24cc28c781d0593b2a5d0589b4a7ad':
  Revert "Pack relocation tables for all dynamic executables"
2015-04-23 04:44:50 +00:00
Dimitry Ivanov 1eca10fa9d Revert "Pack relocation tables for all dynamic executables"
This reverts commit e7a1b8a0c6.

Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
2015-04-23 04:22:33 +00:00
Dmitriy Ivanov 943381b7df am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables"
* commit 'ff084258ea53c414d724ba87f89c324056def1bd':
  Pack relocation tables for all dynamic executables
2015-04-23 03:42:44 +00:00
Dmitriy Ivanov b7b2762138 am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables"
* commit '64119a7ff23960615c607306c9190c1def622d23':
  Pack relocation tables for all dynamic executables
2015-04-23 02:44:47 +00:00
dcashman 9d50b548cd resolved conflicts for merge of b9e4848e to master
Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
2015-04-22 14:49:23 -07:00
Dmitriy Ivanov e7a1b8a0c6 Pack relocation tables for all dynamic executables
Bug: http://b/18051137
Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
2015-04-22 13:30:43 -07:00
dcashman 0ae8bf67af am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution."
* commit '780bdd6a1363cfe2fb9425647e0458dd2aee43f4':
  Add lib dirs to cts distribution.
2015-04-22 18:55:13 +00:00
dcashman ab59266db0 Merge "Add lib dirs to cts distribution." 2015-04-22 17:02:32 +00:00
dcashman 17412c8305 Add lib dirs to cts distribution.
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.

Bug: 19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
2015-04-21 17:53:21 -07:00
Dmitriy Ivanov 594c0868d4 resolved conflicts for merge of 6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
2015-04-20 14:08:43 -07:00
Dmitriy Ivanov 6cb3732d82 am baca453a: am 5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
* commit 'baca453a7d23fb2cf8a38d8aad3addbfce362afc':
  Remove unsupported *_COMPRESS_MODULE_SYMBOLS
2015-04-20 20:43:18 +00:00
Dmitriy Ivanov 4eb120b999 Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
2015-04-20 12:24:12 -07:00
Nick Kralevich 445e111def Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are used
LOCAL_PREBUILT_JNI_LIBS is an indication to the build system that
all shared libraries should be deleted from an APK, and the shared
libraries should be placed in the application's /system/app directory.

However, using this option isn't appropriate for pre-signed APKs.
Any attempt to delete files from a pre-signed APK will corrupt it's
signature or waste disk space.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: I89ce8f06d3889dd79dd9ffe86fc5fa60814498ad
2015-04-18 15:11:36 -07:00
Nick Kralevich e128152c4c am ebe3f7a5: am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit 'ebe3f7a59878d797f8f0de234f251958fee1c5af':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
2015-04-18 01:33:09 +00:00
Nick Kralevich ebe3f7a598 am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '700265cee29c442369bfa6ee3f90bd51b79177d9':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
2015-04-18 01:00:47 +00:00
Nick Kralevich 5aa0223c6a Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
2015-04-17 16:53:15 -07:00
Dan Albert c2bc25496d am 07607526: am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."
* commit '07607526b8701f471869aecbd89fe4ea1990251e':
  Add support for a partial ubsan build.
2015-04-17 20:14:13 +00:00
Dan Albert 07607526b8 am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."
* commit '63082eab1f1e18b06882fbbaf08ee64c3f68193a':
  Add support for a partial ubsan build.
2015-04-17 19:53:03 +00:00
Dmitriy Ivanov cc39abfdd2 am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'a6c44859c5344d489526641ce5a08598254da57b':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:42:55 +00:00
Dan Albert b687444051 Merge "Add support for a partial ubsan build." 2015-04-17 19:33:02 +00:00
Dan Albert 5da97b217a am 048b3eb0: am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '048b3eb0170b8816cd97400a43f7f1523c19c210':
  Fix misuse of my_sanitize_host.
2015-04-17 19:30:22 +00:00
Dan Albert c08f725cd8 am 757417f9: am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '757417f9438a3a83d9fa1f7b10d74436fd6f61e4':
  Make use of sanitizers without clang an error.
2015-04-17 19:30:20 +00:00
Dmitriy Ivanov a6c44859c5 am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:20:25 +00:00
Dan Albert 048b3eb017 am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '7a1d29eb4bea37a4f043330cf722f720103129b8':
  Fix misuse of my_sanitize_host.
2015-04-17 19:09:00 +00:00
Dan Albert 757417f943 am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit 'f1b7c073a4d1b3f47811b6b9e85c6589d293c373':
  Make use of sanitizers without clang an error.
2015-04-17 19:08:59 +00:00
Dmitriy Ivanov e3aa1c1f85 Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 18:50:13 +00:00
Dmitriy Ivanov 8f9487431c Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.

Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
2015-04-17 11:39:04 -07:00
Dan Albert b5b2ffe3be Add support for a partial ubsan build.
Some of the ubsan checks expose a few pathological performance cases
in clang, and thus aren't suited to be used in SANITIZE_HOST.

This mode is also supported on the target despite not having the
target runtime libraries for ubsan by generating traps.

Change-Id: I0b0f0a08ca84d72e44e2174a66726b1c5e5cad7e
2015-04-17 11:37:03 -07:00
Dan Albert 4c92a68127 Fix misuse of my_sanitize_host.
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.

Change-Id: Id8a095821d000a184e72f950b9481597073a7044
2015-04-17 11:32:57 -07:00
Dan Albert 94b579166f Make use of sanitizers without clang an error.
Previously using a sanitizer would imply clang. It should be an error
instead so it's more obvious.

Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
2015-04-17 11:06:24 -07:00
Dan Albert f52cf64f6c am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."
* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
  Clean up sanitizer configuration.
2015-04-17 17:32:23 +00:00
Dan Albert fad709772e am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."
* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
  Clean up sanitizer configuration.
2015-04-17 17:08:55 +00:00
Dan Albert 27ccb75af7 Clean up sanitizer configuration.
* Refactor a few pieces to avoid deeply nested conditionals.
 * LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.

Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
2015-04-17 09:39:12 -07:00
Dan Albert 97952ce8ac am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.
2015-04-15 22:56:21 +00:00
Dan Albert 3bc25d6958 am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.
2015-04-15 22:32:08 +00:00
Dan Albert 4ed9508842 Merge "Add support for ubsan." 2015-04-15 22:06:15 +00:00
Ying Wang 87a21c8b89 resolved conflicts for merge of eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
2015-04-15 14:39:26 -07:00
Kenny Root eec386a4df am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping
2015-04-15 20:12:21 +00:00
Kenny Root dff3755a93 Move package signing after file stripping
For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.

Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.

Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
2015-04-15 12:40:22 -07:00
Ying Wang 599b07a4b2 Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-04-15 17:10:05 +00:00
Mark Salyzyn 4660814b51 am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:28:39 +00:00
Mark Salyzyn d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:05:55 +00:00
Mark Salyzyn 8b75ec1c7b Merge "disttools: add liblog, libcutils and libselinux shared libraries" 2015-04-15 14:45:05 +00:00
Yohann Roussel 77cbe10fd9 Use Jack launcher
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
2015-04-15 12:29:01 +02:00
Dan Albert cbdd2c348f am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:56:11 +00:00
Dan Albert 1fa6d5b0a3 am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:34:03 +00:00
Dan Albert ad1961a747 Merge "Don't use libunwindbacktrace for non-ARM." 2015-04-14 23:17:41 +00:00
Dan Albert c2ac7201a7 am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.
2015-04-14 23:08:47 +00:00
Dan Albert 803cf69926 am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
  Use libcompiler_rt-extras on the host too.
2015-04-14 22:48:57 +00:00
Mark Salyzyn c506e74dc8 disttools: add liblog, libcutils and libselinux shared libraries
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
2015-04-14 15:17:16 -07:00
Dan Albert 2d215e38c0 Merge "Use libcompiler_rt-extras on the host too." 2015-04-14 22:04:56 +00:00
Dan Albert 3e99e66213 Don't use libunwindbacktrace for non-ARM.
After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a
2015-04-14 14:42:45 -07:00
Ying Wang 036b53b6de Auto-clean host tools when switching between apps_only and platform build.
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
2015-04-14 14:14:19 -07:00