openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
42,300 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

42300 Commits

Author SHA1 Message Date
Tao Bao 894cba2954 Merge "releasetools: Check for duplicate entries in ReplaceCerts()." am: 8bfde7c5fb 
am: 7032691417

Change-Id: Icc23606930f1a2f3e0009b1ec225723ffc8a7617
 2018-02-22 17:57:03 +00:00
Tao Bao 7032691417 Merge "releasetools: Check for duplicate entries in ReplaceCerts()." 
am: 8bfde7c5fb

Change-Id: Iacbcd97f246b499edc834fb23c45489ea0708a5e
 2018-02-22 17:48:28 +00:00
Tao Bao 8bfde7c5fb Merge "releasetools: Check for duplicate entries in ReplaceCerts()." 2018-02-22 17:39:00 +00:00
Mathew Inwood 24b47e09ae Merge "Include hiddenapi-whitelist.xml in the build." am: b3d619f22d 
am: cf68e9e8bd

Change-Id: I899ca99f960e450ada6f31a0707cf085d5021acd
 2018-02-22 14:25:18 +00:00
Mathew Inwood cf68e9e8bd Merge "Include hiddenapi-whitelist.xml in the build." 
am: b3d619f22d

Change-Id: I6df907d6487d1397d6c6e636477c09a268e98402
 2018-02-22 14:08:52 +00:00
Mathew Inwood b3d619f22d Merge "Include hiddenapi-whitelist.xml in the build." 2018-02-22 12:57:48 +00:00
hansson 1f903cce0c Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668 
am: ab8f5d74f2

Change-Id: I46e339b3faf05092e01950ca702f11d647667d02
 2018-02-22 11:53:50 +00:00
hansson ab8f5d74f2 Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." 
am: 3c76d02668

Change-Id: I6e0c617a1e6fc8300ca1e861612d2f32a066b63e
 2018-02-22 11:45:43 +00:00
hansson 3c76d02668 Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." 2018-02-22 11:33:57 +00:00
Mathew Inwood 0874887627 Include hiddenapi-whitelist.xml in the build. 
See I1cbbd220c61b1b4b767c301f97096607ee902a7b which introduces this file.

Test: see related change I1cbbd220c61b1b4b767c301f97096607ee902a7b

Merged-In: I23dba07a5d83e4325227892e0a11a758e093effa
Change-Id: I0030718b932ea588120492fd8bcab1f389a40324
 2018-02-22 11:10:57 +00:00
Nan Zhang 7e634580ba Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd 
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
 2018-02-22 02:29:18 +00:00
Nan Zhang 90b8d087e6 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." 
am: d3bec931cd

Change-Id: I5783697afde068a1d77a9d9960554b29eab265a2
 2018-02-22 02:21:13 +00:00
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 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
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
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
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 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
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 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 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 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 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 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
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
Dan Willemsen cfc82c4b33 Merge "Add Docker instructions for older branches" 
am: c6620457d8

Change-Id: Idef0d5b914778b2198ced4a0af40f21fa1c76f4e
 2018-02-17 01:11:25 +00:00
Dan Shi 4125716024 Merge "build: Default test modules to null-suite" am: b6655e0e1a 
am: f2f7c7d6f6

Change-Id: I065476483b5cdb87908bd7ac46f2b1da3d501c12
 2018-02-17 01:03:45 +00:00
Treehugger Robot c6620457d8 Merge "Add Docker instructions for older branches" 2018-02-17 00:59:17 +00:00
Dan Shi f2f7c7d6f6 Merge "build: Default test modules to null-suite" 
am: b6655e0e1a

Change-Id: I0de87e2097146c9c56e8d34a5418a0e86b05c20b
 2018-02-17 00:55:04 +00:00
Dan Shi b6655e0e1a Merge "build: Default test modules to null-suite" 2018-02-17 00:39:27 +00:00