Commit Graph

7330 Commits

Author SHA1 Message Date
Dimitry Ivanov
a66f8bae07 am 9c836723: am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '9c836723b784a344442d4646fc849470b8fcd515':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:33:25 +00:00
Dimitry Ivanov
9c836723b7 am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '72bced8a758a3a8427768d97e6d763f6a706d2b1':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:19:49 +00:00
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
Ying Wang
562d700ab9 Make AndroidTest.xml optional.
Make AndroidTest.xml optional for compatibility suite module.

Change-Id: I6622e17191fa67b33c577056681b989516f3a3a8
2015-06-04 11:22:23 -07:00
Narayan Kamath
50661cf872 am fd0cd12a: am cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit 'fd0cd12ac94ce735efad32ec3fc9cff99dce394a':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-04 11:26:44 +00:00
Narayan Kamath
fd0cd12ac9 am cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit 'cf7fbcd03d9f13d1c2fe6e65f02247feadec136d':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-04 11:14:40 +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
Ying Wang
b6a96a7698 Merge "Add support for LOCAL_COMPATIBILITY_SUITE" 2015-06-04 00:22:26 +00:00
Ying Wang
1624361d84 Add support for LOCAL_COMPATIBILITY_SUITE
A module can specify itself to be a Compatibility Suite module with:
LOCAL_COMPATIBILITY_SUITE := <cts-name>
<cts-name> can be "cts" or any other cts name supported by the
build system.

The cts name's config.mk must define global variable
COMPATIBILITY_TESTCASES_OUT_<cts-name> to point to the testcase
output directory.
This change copies the module's built file, as well as the module's
AndroidTest.xml, to the testcase output directory.
The build system collects all the testcase files in a global variable
COMPATIBILITY.<cts-name>.FILES, which you can reference in a build
task that builds the suite's zip package.
Also copy over the test case files if user runs mm/mmm/etc.

Change-Id: Ica0dbc4f193db7de7d395b9c686733bdac41f566
2015-06-03 16:21:12 -07:00
Ying Wang
cc7cbea11b am 9e8899c7: am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '9e8899c75e82d50024de3f6e50d85f842479a4ab':
  Add VeritySigner.jar to ota tools
2015-06-03 19:23:22 +00:00
Ying Wang
9e8899c75e am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
  Add VeritySigner.jar to ota tools
2015-06-03 18:36:20 +00:00
Ying Wang
3bb1bea968 am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '9fed6369b6ee4ad07a0313fa5321047be1d79b85':
  Add VeritySigner.jar to ota tools
2015-06-03 16:52:49 +00:00
Claes Elgemark
d53cd9b0b1 Add VeritySigner.jar to ota tools
Used by verity_signer

Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
2015-06-03 16:41:51 +00:00
Yohann Roussel
4ca87fc9ad am 16ee5345: am a9dd74c3: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
* commit '16ee5345a8e1fc01c82f625193d0b702b8b37a42':
  Add support for RMTYPEDEF with Jack
2015-06-02 20:31:32 +00:00
Yohann Roussel
16ee5345a8 am a9dd74c3: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
* commit 'a9dd74c39515759599a3b01f7772de9f19325800':
  Add support for RMTYPEDEF with Jack
2015-06-02 14:24:53 +00:00
Yohann Roussel
b518c3ec0b [DO NOT MERGE] Add support for RMTYPEDEF with Jack
Bug: 21099584

(cherry-picked from commit 5b2c6e26db)

Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-06-02 12:25:51 +02: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
9a9f98d15e am f4710290: am 9cc3b757: am 91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit 'f4710290bf211a98c62bc4e8cd17c64cb30a64c7':
  Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 19:06:28 +00:00
Ying Wang
f4710290bf am 9cc3b757: am 91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit '9cc3b7572c29184d77f477df2b0376fc2f4b589a':
  Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 18:50:00 +00:00
Ying Wang
9cc3b7572c am 91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit '91c2f7053d131cb9449eccfda97ec80130dbf451':
  Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 18:37:12 +00:00
Ying Wang
30127bfdad 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 existing SDK
directory structure.

Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
(cherry-pick from commit 4fe7bfd373)
2015-06-01 11:28:02 -07: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
74eda81327 am e9bf6e77: am 8b79abfb: am c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit 'e9bf6e77509433545571a973d9f85d32af1fdb4e':
  Remove gcc 4.9 workaround.
2015-05-29 20:49:33 +00:00
Chih-Hung Hsieh
e9bf6e7750 am 8b79abfb: am c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit '8b79abfb4458193ee28949882a712b03e7828c53':
  Remove gcc 4.9 workaround.
2015-05-29 20:36:19 +00:00
Chih-Hung Hsieh
8b79abfb44 am c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit 'c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56':
  Remove gcc 4.9 workaround.
2015-05-29 20:28:08 +00:00
Chih-Hung Hsieh
128d51e67e Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.

BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
(cherry picked from commit ad2494bb79)
2015-05-29 12:06:36 -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
Elliott Hughes
4431b04d95 am 9b7356cc: am a6b14661: am 1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit '9b7356cc6d80f7cffcf13d1e307f17423343427c':
  [MIPS] Do not use compact branches until GDB supports them
2015-05-29 05:16:03 +00:00
Elliott Hughes
9b7356cc6d am a6b14661: am 1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit 'a6b14661687d8da6a8f566dd2fb104986b411565':
  [MIPS] Do not use compact branches until GDB supports them
2015-05-29 05:07:20 +00:00
Elliott Hughes
a6b1466168 am 1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit '1a81a0efca84990648a0b0f023b8a270226303ae':
  [MIPS] Do not use compact branches until GDB supports them
2015-05-29 04:54:33 +00:00
Elliott Hughes
1a81a0efca Merge "[MIPS] Do not use compact branches until GDB supports them" 2015-05-29 04:41:27 +00:00
David Srbecky
9dd19245d4 am 8ae9a6e1: am b8184451: am cb46fa78: Merge "Pass --no-generate-debug-info to dex2oat."
* commit '8ae9a6e154cca78d0c6fab56ac516d97014ad7db':
  Pass --no-generate-debug-info to dex2oat.
2015-05-28 20:31:13 +00:00
David Srbecky
8ae9a6e154 am b8184451: am cb46fa78: Merge "Pass --no-generate-debug-info to dex2oat."
* commit 'b81844517e72c7ce319556f9684a37769f3b71af':
  Pass --no-generate-debug-info to dex2oat.
2015-05-28 20:16:47 +00:00
David Srbecky
b81844517e am cb46fa78: Merge "Pass --no-generate-debug-info to dex2oat."
* commit 'cb46fa780c6d87baebcadbf22567d78836f12295':
  Pass --no-generate-debug-info to dex2oat.
2015-05-28 18:53:20 +00:00
Yohann Roussel
5b2c6e26db Add support for RMTYPEDEF with Jack
Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-05-28 18:10:03 +02:00
David Srbecky
d8fae9a6a6 Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.

Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
2015-05-28 16:32:55 +01:00
Shinichiro Hamaji
1d97b9013c Remove an unmatched rightparen
Change-Id: I34faa15f2dd1fca80bde5708f40714efec04a743
2015-05-28 17:44:03 +09:00
Ying Wang
caf14b2016 am 92ed0127: am 45c8b574: am b5f59372: am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '92ed01274bc434eb2bae157fb98ffe84902e4ee4':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-28 00:42:40 +00:00
Ying Wang
92ed01274b am 45c8b574: am b5f59372: am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '45c8b574b63e3f79446a10e98001f96302b17179':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-28 00:18:27 +00: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
6f76a2d7ce am 899717ff: Add huawei to vendor owner whitelist [DO NOT MERGE]
* commit '899717ff2ac15357411217d7d568a495a07822ca':
  Add huawei to vendor owner whitelist [DO NOT MERGE]
2015-05-27 15:44:56 +00: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
Nikola Veljkovic
063ef33089 [MIPS] Do not use compact branches until GDB supports them
GDB does not yet have support for compact branches, and is unable to
set a breakpoint on them. Turn compact branch generation off, until
GDB is fixed.

Change-Id: Ie7d6fb891e9934f8fc645fe9cf8f706be15a5f77
2015-05-25 16:27:01 +02:00
Kris Giesing
f93d8dd6c2 Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev 2015-05-22 18:58:18 +00:00