StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,543 Commits 1 Branch 0 Tags
f70aa4cde7c49f013afbbe188528fda552acda9c
Commit Graph

43543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dan Willemsen
44cca0767e Merge "Support core_current when exporting resources from a package" 
am: 64006ad4f3

Change-Id: I4929cbf235d0154ddab68c6fbd5d0cf29719c2f1
 2018-02-16 23:57:08 +00:00
Mathieu Chartier
d66be15c96 Merge "Add a product property for changing the default compiler filter" 
am: 60431c098e

Change-Id: I32c7c75aa2721aad3363e159b81dc364a50d41ba
 2018-02-16 23:56:39 +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
0d68c850f7 Merge "Partially revert BUILD_DATETIME change" 
am: f5a87046c5

Change-Id: I490fc1d892771307587d439eb2e83907baaa9eda
 2018-02-16 20:08:27 +00:00
Colin Cross
f5a87046c5 Merge "Partially revert BUILD_DATETIME change" 2018-02-16 19:55:37 +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
Adam Lesinski
d02d0723c4 Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" am: dc6e822374 am: 02a9374e93 
am: fffec91ad7

Change-Id: Idfb7446a8038bf246c5620f7da1dad030fb66b94
 2018-02-16 04:00:55 +00:00
Adam Lesinski
fffec91ad7 Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" am: dc6e822374 
am: 02a9374e93

Change-Id: Icb4275ed1c3e6bb87a913025ca8ee1afd9046662
 2018-02-16 03:52:48 +00:00
Adam Lesinski
02a9374e93 Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" 
am: dc6e822374

Change-Id: I7bd7c56e4d1c6d0b43729c772b61ef8f8da77be9
 2018-02-16 03:46:13 +00:00
Calin Juravle
9aaf050c76 Merge "Record the compilation reson in oat files for prebuilts" am: 87774191b3 am: 1697a9b6f0 
am: 92fc421d24

Change-Id: I339f1df6878d5f16916b59816ff812f5d2b34653
 2018-02-16 03:40:43 +00:00