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

15910 Commits

Author SHA1 Message Date
Przemyslaw Szczepaniak a5b2bad232 Merge "Remove org.apache.http.legacy from bootclasspath" 2018-02-23 14:05:59 +00:00
Nan Zhang 08dc62dd09 Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 am: 7edfe29e8f 
am: b335c4a4f3

Change-Id: I9ebf18cf05571c4d5cf31c41fb5f60114a375480
 2018-02-22 23:25:08 +00:00
Nan Zhang b335c4a4f3 Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 
am: 7edfe29e8f

Change-Id: I1ef8af667a806ead8c4098bbdab12d377e8fd7b1
 2018-02-22 23:11:08 +00:00
Treehugger Robot 5d7ec6bdf8 Merge "Export Make config vars to Soong to support Droiddoc" 2018-02-22 22:11:07 +00:00
Przemyslaw Szczepaniak bd613de7ff Remove org.apache.http.legacy from bootclasspath 
Another attempt, waiting for b/73762903 to be mitigated

Change-Id: I496b1297f5dfe0737828ab01fc1b628f64a57304
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
 2018-02-22 16:38:49 +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
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 3c76d02668 Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." 2018-02-22 11:33: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
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
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
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
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
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
Treehugger Robot 6cb3e300fc Merge "have patchoat take directories instead of filenames" 2018-02-20 18:30:42 +00: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 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
Treehugger Robot 5fdae96b06 Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" 2018-02-17 03:15:58 +00: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
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
Dan Shi b6655e0e1a Merge "build: Default test modules to null-suite" 2018-02-17 00:39:27 +00:00
Dan Willemsen ed767bc62a Merge "Support core_current when exporting resources from a package" am: 64006ad4f3 am: 44cca0767e 
am: c15e211a1c

Change-Id: I768268624b00cb42cefa5b0043133119e591e70d
 2018-02-17 00:14:35 +00:00
Mathieu Chartier 91055f89db Merge "Add a product property for changing the default compiler filter" am: 60431c098e am: d66be15c96 
am: 18f0f94b01

Change-Id: I6c7eac17b86ea26d9cae2f2f525c25f3847168e8
 2018-02-17 00:13:55 +00:00
Dan Willemsen c15e211a1c Merge "Support core_current when exporting resources from a package" am: 64006ad4f3 
am: 44cca0767e

Change-Id: I3fb400c2567abf6d4f2c618a9786a59a29f2a8d2
 2018-02-17 00:05:22 +00:00
Mathieu Chartier 18f0f94b01 Merge "Add a product property for changing the default compiler filter" am: 60431c098e 
am: d66be15c96

Change-Id: I7f0dcc976665f882cb032b64eb582c3ed4831bed
 2018-02-17 00:04:46 +00:00
Treehugger Robot 64006ad4f3 Merge "Support core_current when exporting resources from a package" 2018-02-16 23:41:26 +00:00
Mathieu Chartier 60431c098e Merge "Add a product property for changing the default compiler filter" 2018-02-16 23:41:21 +00:00
TreeHugger Robot 7c9bbd37cd Merge "Allow projects to define their own globally-available variables" 2018-02-16 22:29:02 +00:00
Dan Willemsen c51b7b0d55 Support core_current when exporting resources from a package 
Bug: 73351844
Test: with https://googleplex-android-review.git.corp.google.com/c/platform/cts/+/3621794
Change-Id: I20b8adf0d7cb5d948ba752e0732bbe84d39a419a
 2018-02-16 13:32:26 -08:00
Colin Cross b351b6ebde Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5 am: 0d68c850f7 
am: 4b03c695d6

Change-Id: Ife94343139c513f5e80c87d8dbcd88587f99f2e3
 2018-02-16 20:25:09 +00:00
Colin Cross 4b03c695d6 Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5 
am: 0d68c850f7

Change-Id: I2792a15a40f3d51a3d6a5a446e45071dd0970e9a
 2018-02-16 20:17:07 +00:00
Colin Cross ce8c05196d Partially revert BUILD_DATETIME change 
Change Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901 caused kati to
regenerate on every build:
$(shell cat out/build_date.txt) was changed, regenerating...
Switch back to $(shell date +%s) which is special cased in kati
to not cause a regeneration.  Everything besides DATE will still
use BUILD_DATETIME_FROM_FILE from soong_ui.

Once BUILD_NUMBER is moved to soong_ui $(DATE) is no longer
necessary and the whole thing can be removed.

Bug: 70351683
Bug: 73352417
Test: m && m doesn't regenerate
Test: m BUILD_DATETIME=1234 shows up in ro.build.version.incremental
Change-Id: I8444beb2b47a49095ef760083fc85f220821bffe
 2018-02-16 09:41:24 -08:00