Commit Graph

43356 Commits

Author SHA1 Message Date
Treehugger Robot d3bec931cd Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." 2018-02-22 02:07:15 +00:00
Mathieu Chartier bccd0a571b Merge "Add property for generating dm files" am: 3d2b45ad55 am: d8cb5746be
am: a6355cbc9b

Change-Id: I5e99c7753a9c0831f8ee0b9223bc1a7b6b56540d
2018-02-22 01:50:08 +00:00
Mathieu Chartier a6355cbc9b Merge "Add property for generating dm files" am: 3d2b45ad55
am: d8cb5746be

Change-Id: I6cee03620521d4846a23a6a65e413c484ad7ada3
2018-02-22 01:42:33 +00:00
Mathieu Chartier d8cb5746be Merge "Add property for generating dm files"
am: 3d2b45ad55

Change-Id: I1c22d41b70d3af9daf596a6e02346605a94950b7
2018-02-22 01:34:26 +00:00
Mathieu Chartier 3d2b45ad55 Merge "Add property for generating dm files" 2018-02-22 01:20:29 +00:00
Tao Bao 15a146a7c4 releasetools: Allow skipping postinstall hooks when generating A/B OTAs.
This CL adds a new flag '--skip_postinstall' that allows skipping all
the postinstall hooks when generating an A/B OTA package (default:
False). Note that this discards ALL the hooks, including non-optional
ones. Should only be used if caller knows it's safe to do so (e.g. all
the postinstall work is to dexopt apps and a data wipe will happen
immediately after).

Bug: 73547992
Test: python -m unittest test_ota_from_target_files
Test: Generate a full OTA package for walleye. Examine the generated
      payload.
Change-Id: Ifc069e897b4019605051eabfd221230a6a37867c
2018-02-21 16:34:19 -08:00
Nan Zhang 0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Mathieu Chartier 5c658ac3a9 Add property for generating dm files
Added product property: PRODUCT_DEX_PREOPT_GENERATE_DM_FILES.
If this property is true, APKs compiled as verify will have the dex
files left compressed and the vdex put in a dm file. The vdex file
and oat files are not copied to system partition in this case.

Bug: 70934104
Test: manual

Change-Id: Ie137e14f14642b803a506162de6db8ac65a43f46
2018-02-21 13:50:21 -08:00
Dan Shi 96068b77ed Default test to AndroidJUnitTest for auto-generated test config.
All new instrumentation tests shall use AndroidJUnitRunner, thus default
test class to AndroidJUnitTest.

Bug: 73679956
Test: unittest
Change-Id: I52df4d01b8459a4a6e5c2cbe15973dab079fb136
2018-02-21 11:31:06 -08:00
Anton Hansson 7ff32d2734 Add support for LOCAL_PRIVATE_PLATFORM_APIS.
The only enforcement right now is that modules don't specify both
LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning
can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable.

Bug: 73535841
Test: make w/ and wo/ flag.
Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 18:10:59 +00:00
Przemyslaw Szczepaniak 58b793771c Remove org.apache.http.legacy from bootclasspath
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
Change-Id: I6a6d35198c49ed8a0b370fbe4a94320aefc4d7c3
2018-02-21 18:04:28 +00:00
Mathew Inwood a2a7baa98b Include hiddenapi-whitelist.xml in the build.
Test: see related change I94746b7f12dd9371d5068bb235eb853f63ee4d97
Change-Id: I23dba07a5d83e4325227892e0a11a758e093effa
2018-02-21 09:43:44 +00:00
Tao Bao 039ccf14ca Merge "releasetools: Clean up test_sign_target_files_apks.py." am: 5ef78033d5 am: e1fee81bb5
am: 4e636f0441

Change-Id: I9133283350bd0d9c74d6d2b9b313a5fd1103aa48
2018-02-21 02:36:43 +00:00
Tao Bao 4e636f0441 Merge "releasetools: Clean up test_sign_target_files_apks.py." am: 5ef78033d5
am: e1fee81bb5

Change-Id: I3c504df0a047b88725433c68079c18495d536afe
2018-02-21 02:29:12 +00:00
Tao Bao e1fee81bb5 Merge "releasetools: Clean up test_sign_target_files_apks.py."
am: 5ef78033d5

Change-Id: I70fff395a1923cc5566559662d3f9ee43adcea90
2018-02-21 02:21:07 +00:00
Tao Bao 5ef78033d5 Merge "releasetools: Clean up test_sign_target_files_apks.py." 2018-02-21 02:06:00 +00:00
Tao Bao 90c3d2ebb5 Merge "releasetools: Add a testcase for common.ParseCertificate()." am: a0f55ee9eb am: 9773a2f7b2
am: 6f142ef096

Change-Id: Ic838ebf4e59d8d90eb102c0ae4399b639fcf64f6
2018-02-21 00:48:47 +00:00
Tao Bao 6f142ef096 Merge "releasetools: Add a testcase for common.ParseCertificate()." am: a0f55ee9eb
am: 9773a2f7b2

Change-Id: I3b00809f57c7f42f69fdbb44cdc5516e585ee987
2018-02-21 00:28:14 +00:00
Tao Bao 9773a2f7b2 Merge "releasetools: Add a testcase for common.ParseCertificate()."
am: a0f55ee9eb

Change-Id: Ibba4b572b75f470837f7026b131bdc83b5de5b58
2018-02-21 00:21:27 +00:00
Tao Bao a0f55ee9eb Merge "releasetools: Add a testcase for common.ParseCertificate()." 2018-02-21 00:04:24 +00:00
TreeHugger Robot 0710ca2056 Merge "Add rule to enable running Jetifier within Make against Java modules" 2018-02-20 23:35:10 +00:00
Jeff Gaston d2ba724f7f Add rule to enable running Jetifier within Make against Java modules
The only case where we expect to actually enable this behavior is for
modules that are just an unpacking of a prebuilt, because those are
the only cases for which we can't conveniently just change the source

Bug: 72552006
Test: ./build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm 'build/make:work^' \
      'build/make:work'
Test: cherry-pick the following patch that depends on this one and
      the rest of that patch's topic, and then do `m -j jeffapp`

Change-Id: I62e231900d6d87673ddf19c7fc2686fef2828590
2018-02-20 22:25:23 +00:00
Tao Bao 4051a05b54 Merge "releasetools: Add unittest for common.GetSparseImage()." am: 35ee189898 am: 625b5b7a09
am: 0fa48c8c52

Change-Id: I12997ace8bfc5936a6db773b570c7ec2e26edb47
2018-02-20 21:27:34 +00:00
Tao Bao 0fa48c8c52 Merge "releasetools: Add unittest for common.GetSparseImage()." am: 35ee189898
am: 625b5b7a09

Change-Id: I494f253ab122f4098ec1e1fd814c915e618e2aa2
2018-02-20 21:21:31 +00:00
Tao Bao 625b5b7a09 Merge "releasetools: Add unittest for common.GetSparseImage()."
am: 35ee189898

Change-Id: Id9c88438e7753996b699edf8faf6cb50734d810c
2018-02-20 21:14:53 +00:00
Treehugger Robot 35ee189898 Merge "releasetools: Add unittest for common.GetSparseImage()." 2018-02-20 21:04:58 +00:00
Colin Cross 9489d36c23 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" am: fcb10864b7 am: 55219c3bf8
am: 64351dfa66

Change-Id: I7b143d8db9ecc9c7b1c57881d2a5357fc1312e34
2018-02-20 20:20:59 +00:00
Colin Cross 64351dfa66 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" am: fcb10864b7
am: 55219c3bf8

Change-Id: I602d1ce56636e86d607e05a9a400b1f29c8961bf
2018-02-20 20:13:15 +00:00
Colin Cross 55219c3bf8 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"""
am: fcb10864b7

Change-Id: Id01043662b9d0ade1b5c83841350cf8d496a2da0
2018-02-20 20:06:14 +00:00
Treehugger Robot fcb10864b7 Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" 2018-02-20 19:50:50 +00:00
Chris Morin cff1aa0d87 Merge "have patchoat take directories instead of filenames" am: 6cb3e300fc am: 8955ffb648
am: e5a0e49daa

Change-Id: I4f061027ac127092f0d782263399f3f4d9ab720e
2018-02-20 18:59:56 +00:00
Chris Morin e5a0e49daa Merge "have patchoat take directories instead of filenames" am: 6cb3e300fc
am: 8955ffb648

Change-Id: I92b0c75a3cdfec4a0927865635ce92a001f61632
2018-02-20 18:54:10 +00:00
Chris Morin 8955ffb648 Merge "have patchoat take directories instead of filenames"
am: 6cb3e300fc

Change-Id: I630c51c5e80febd46d90ceb1c0b9e58c16746c8c
2018-02-20 18:47:45 +00:00
Treehugger Robot 6cb3e300fc Merge "have patchoat take directories instead of filenames" 2018-02-20 18:30:42 +00:00
Tao Bao 66472637ad releasetools: Check for duplicate entries in ReplaceCerts().
testdata/{media,platform}.x509.pem files are copied from
build/target/product/security/.

Fixes: 69479366
Test: python -m unittest test_sign_target_files_apks
Change-Id: I8ba42b6f5b5432ee4b8786b241daff11db792c14
2018-02-20 10:22:30 -08:00
Tao Bao de1d479ace releasetools: Clean up test_sign_target_files_apks.py.
Since we have been carrying test certificates in testdata/ for other
tests, do the same for test_sign_target_files_apks.py. Copy
verity.x509.pem from build/target/product/security/ to testdata/ for
that purpose.

Also capture the stderr output in ReplaceVerityKeyId().

Test: python -m unittest test_sign_target_files_apks
Change-Id: Ie11e042086952e8a4a5a63950cb0b16cc436b7e6
2018-02-20 10:12:15 -08:00
Elliott Hughes 05ae8ed76b Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e am: be692347f5
am: 8375aa9168

Change-Id: I051cabcc401ae92352767afa27a3b490a23247a1
2018-02-20 15:52:15 +00:00
Elliott Hughes 8375aa9168 Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e
am: be692347f5

Change-Id: I836342c819bfb0dd5360c9e833859923d1f54e40
2018-02-20 15:44:11 +00:00
Elliott Hughes be692347f5 Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too."
am: 1d7d1eb65e

Change-Id: Ifa1bd8a71ea1ecc060f49993533d4348b92d364d
2018-02-20 15:37:07 +00:00
Elliott Hughes 1d7d1eb65e Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." 2018-02-20 15:27:54 +00:00
Dan Willemsen b5ab2c7828 Merge "Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))"" 2018-02-19 22:51:11 +00:00
Dan Willemsen a350b67ec4 Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06 am: 1964dbc6ad
am: 6bd3e1f31c

Change-Id: Ib9b3d96487017f7cc05b97f5879efbfeefec94ca
2018-02-17 04:19:27 +00:00
Dan Willemsen 6bd3e1f31c Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06
am: 1964dbc6ad

Change-Id: I6c73171efc7e741338bea0bd9cc2632be93a10e6
2018-02-17 04:10:02 +00:00
Dan Willemsen 1964dbc6ad Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"""
am: 5fdae96b06

Change-Id: I25ffe5d7c864ba0edd30f7a0696178e66df6234f
2018-02-17 04:02:24 +00:00
Treehugger Robot 5fdae96b06 Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" 2018-02-17 03:15:58 +00:00
Dan Willemsen dcdc1685c7 Merge "Add Docker instructions for older branches" am: c6620457d8 am: cfc82c4b33
am: aa582f7dda

Change-Id: I84b2706e169ecb4835cd1dd8193576a6001e750a
2018-02-17 01:27:40 +00:00
Dan Willemsen aa582f7dda Merge "Add Docker instructions for older branches" am: c6620457d8
am: cfc82c4b33

Change-Id: Ia6404fa198f502ad9be811a83ca19a7fee31bb17
2018-02-17 01:19:32 +00:00
Tao Bao 17e4e61691 releasetools: Add a testcase for common.ParseCertificate().
Also minor clean up to the function, to suppress the following lint
warning.
R:1813, 2: Redefinition of cert type from list to unicode (redefined-variable-type)

Test: python -m unittest -v test_common.CommonApkUtilsTest
Change-Id: Ib4b1dfa8b19e505fc70684b648efc36171c73bbf
2018-02-16 17:14:23 -08:00
Dan Shi e2a2481619 Merge "build: Default test modules to null-suite" am: b6655e0e1a am: f2f7c7d6f6
am: 4125716024

Change-Id: I529300c539b16e72e65885b72c80fa076ec11ff2
2018-02-17 01:12:30 +00:00
Elliott Hughes adf7ef8eb9 Use the platform -std= for LOCAL_SDK_VERSION targets too.
Bug: http://b/72571399
Test: builds
Change-Id: Ifd06798a7c9af9fd316201d88b724a53bcf0bcd9
2018-02-16 17:12:21 -08:00