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

43322 Commits

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

Change-Id: Ic89d331846654d23768e90cb4abab1b91d744271
 2018-02-22 18:05:39 +00:00
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
Przemyslaw Szczepaniak 99abb9f731 Merge "Revert "Remove org.apache.http.legacy from bootclasspath"" 2018-02-22 16:10:12 +00:00
Przemyslaw Szczepaniak 929db472be Revert "Remove org.apache.http.legacy from bootclasspath" 
This reverts commit 58b793771c.

Reason for revert: b/73762903

Change-Id: I2faa22d47278d436baa6d7994f0bad879ac7265b
Exempt-From-Owner-Approval: Revert
 2018-02-22 16:07:53 +00:00
Mathew Inwood d4ce430185 Merge "Include hiddenapi-whitelist.xml in the build." am: b3d619f22d am: cf68e9e8bd 
am: 24b47e09ae  -s ours

Change-Id: I4013a75033952174b0ed1da0da340eb1dc452dfa
 2018-02-22 15:57:26 +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 1b7700340c Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668 am: ab8f5d74f2 
am: 1f903cce0c

Change-Id: I6558665d9488b462fd00ad89a570817f0a03c23d
 2018-02-22 12:03:30 +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
TreeHugger Robot 3d4d61d080 Merge "Remove org.apache.http.legacy from bootclasspath" 2018-02-22 04:34:34 +00:00
Nan Zhang 972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6 
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
 2018-02-22 02:36:22 +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 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
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
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