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

41791 Commits

Author SHA1 Message Date
Jaegeuk Kim 6149ea8637 Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3 am: a5a2f10d79 
am: cc1d0c982e

Change-Id: I6a40d04c8935627f75ccf13b467bc96e63bfb2ee
 2017-12-08 17:00:37 +00:00
Jaegeuk Kim cc1d0c982e Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3 
am: a5a2f10d79

Change-Id: Icbca3310a938e2c48d4e82c2dd1454fec2a05c92
 2017-12-08 01:13:43 +00:00
Jaegeuk Kim a5a2f10d79 Merge "core, release: add sload.f2fs for otatools.zip" 
am: 10c9f5d9d3

Change-Id: Ic0735affd801275c3c2f91535b8c5dfad7c75981
 2017-12-08 01:07:30 +00:00
Dan Shi a20b6aa331 Merge "Create artifacts to include the list of test configs" am: c6b28799e9 am: 00d3e58d1c 
am: aa9f05a409

Change-Id: Ieb9380ef416c897b07af7444152e547cfa03f688
 2017-12-08 01:04:46 +00:00
Elliott Hughes 7fe213507e Merge "Get off my lawn forever!" am: 68a6b90f6b am: de2b92aa6e 
am: 811e87ccbb

Change-Id: I5a9245ca12adb086071c63f302ddab8dc0a8f344
 2017-12-08 01:03:47 +00:00
Dan Shi 34f86d2623 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8 am: 477427a62c 
am: 0c76aa1f03

Change-Id: I0815b039c4fb06ed6d1f44b5b113b8ece71eed4a
 2017-12-08 01:02:33 +00:00
Elliott Hughes ef40ea28a6 Merge "Explain why BuildImage failed." am: 9a33b96103 am: 76eb8e10ee 
am: 20742517b4

Change-Id: Icee1c13e2dc8980ee697395b51e758c69e4b3cdf
 2017-12-08 01:01:26 +00:00
Colin Cross 1999b3b189 Merge changes Ia7feaa13,Ib917761e am: af3984d26d am: c11df9e038 
am: 3f74663fdf

Change-Id: I6768416136793ea26a87fde4368734a0e02e2a3f
 2017-12-08 01:00:12 +00:00
Dan Shi aa9f05a409 Merge "Create artifacts to include the list of test configs" am: c6b28799e9 
am: 00d3e58d1c

Change-Id: Ieba99654675f2c347f91f2ba0d41de970a86889c
 2017-12-08 00:58:12 +00:00
Jaegeuk Kim 10c9f5d9d3 Merge "core, release: add sload.f2fs for otatools.zip" 2017-12-08 00:57:42 +00:00
Dan Shi 00d3e58d1c Merge "Create artifacts to include the list of test configs" 
am: c6b28799e9

Change-Id: I595a5874c642c90e83a10ee5a360661e9c1e9390
 2017-12-08 00:47:56 +00:00
Treehugger Robot c6b28799e9 Merge "Create artifacts to include the list of test configs" 2017-12-08 00:43:20 +00:00
Bo Hu 557bc407f6 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0 am: 079a9f64ac 
am: 71900fc787

Change-Id: I52161ad8547d17b313025f5b8ae0beb4ac406b25
 2017-12-08 00:40:10 +00:00
Colin Cross baae1f3054 Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3 am: 2ea0ecdbfe 
am: f2b5f371ff

Change-Id: I2598404303edb51e31aa45a864c657e08513ba29
 2017-12-08 00:30:39 +00:00
Xin Li 3682bc395e Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5f03da0404 -s ours am: e0b934c66f 
am: 302b83fbc3  -s ours

Change-Id: I02a6bd910b35adb743ab01eae0ea5af6009a9459
 2017-12-08 00:29:41 +00:00
Elliott Hughes 811e87ccbb Merge "Get off my lawn forever!" am: 68a6b90f6b 
am: de2b92aa6e

Change-Id: I071b7894230330ef501b4bd932c8cf48e189de0b
 2017-12-07 23:53:07 +00:00
Elliott Hughes de2b92aa6e Merge "Get off my lawn forever!" 
am: 68a6b90f6b

Change-Id: I5a5ee5015fa598f8f43f09bf73cadb84ccf48746
 2017-12-07 23:48:04 +00:00
Treehugger Robot 68a6b90f6b Merge "Get off my lawn forever!" 2017-12-07 23:33:40 +00:00
Stephen Li 813b511529 Manually merge changes from giant AOSP topic 
Change-Id: I77f2407fb5223146c450f99516fbca55ab3aa900
 2017-12-07 23:29:16 +00:00
Dan Shi 8f1263114b Create artifacts to include the list of test configs 
Bug: 69678490
Test: m -j dist device-tests general-tests
confirm out/dist has device-tests_list.zip and general-tests_list.zip

Change-Id: I185bc66907e37aa5f5da70b2d1b838a73d5f1a51
 2017-12-07 14:37:05 -08:00
Dan Shi 0c76aa1f03 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8 
am: 477427a62c

Change-Id: Ia5e54d76c854084bc28926062e1dea721d0242e8
 2017-12-07 22:19:20 +00:00
Elliott Hughes 20742517b4 Merge "Explain why BuildImage failed." am: 9a33b96103 
am: 76eb8e10ee

Change-Id: I4d9e5dc5050d3826c02a033f856c34b0d397b6b0
 2017-12-07 22:18:13 +00:00
Dan Shi 477427a62c Merge "Create an artifact to include the list of integrated tests in TradeFed" 
am: 3af39153a8

Change-Id: I945ba64038a4a1b79ecdb2ae2fdef042b14ee63c
 2017-12-07 22:12:20 +00:00
Elliott Hughes 76eb8e10ee Merge "Explain why BuildImage failed." 
am: 9a33b96103

Change-Id: I817a6e48e0a2e4690ae7f7abfe31d7d16be5bc61
 2017-12-07 22:08:40 +00:00
Treehugger Robot 3af39153a8 Merge "Create an artifact to include the list of integrated tests in TradeFed" 2017-12-07 22:07:43 +00:00
Elliott Hughes 7a6ef87cbe Get off my lawn forever! 
Let folks opt in if they want the custom title.

Bug: https://issuetracker.google.com/38402256
Test: hitting enter no longer flashes this title
Change-Id: I8c1e1b22cc47ab9496797328fb1b13c0827840b0
 2017-12-07 13:51:23 -08:00
Treehugger Robot 9a33b96103 Merge "Explain why BuildImage failed." 2017-12-07 21:45:59 +00:00
Bo Hu 8c53016e30 Revert "Renames sepolicy files from nonplat_* to vendor_*" 
This reverts commit 38c404c6da.
Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 		out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

(cherry picked from commit 9eb4d74e26)

Change-Id: Ie1b0dace093fa043d9ad3196bafe05d22129fc65
 2017-12-07 07:08:35 -08:00
Colin Cross 3f74663fdf Merge changes Ia7feaa13,Ib917761e am: af3984d26d 
am: c11df9e038

Change-Id: If160b8de399bbc77d1a9b7cc0efb37686cf27bea
 2017-12-07 08:50:12 +00:00
Bo Hu 71900fc787 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0 
am: 079a9f64ac

Change-Id: I11ee739b2990f166daaa6370874a29308f6bd60d
 2017-12-07 08:29:54 +00:00
Colin Cross f2b5f371ff Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3 
am: 2ea0ecdbfe

Change-Id: I0f5fd1e4fad03118989341b7b4de80c7ea4288c6
 2017-12-07 08:27:52 +00:00
Xin Li 302b83fbc3 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5f03da0404 -s ours 
am: e0b934c66f

Change-Id: Ia619a21d3079c7a583f838ce5b555f8d8f5b013d
 2017-12-07 08:26:51 +00:00
Colin Cross c11df9e038 Merge changes Ia7feaa13,Ib917761e 
am: af3984d26d

Change-Id: Ibbdac621b4f2c79e91e7094b0988db6c8b108d32
 2017-12-07 06:37:41 +00:00
Bo Hu 079a9f64ac Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" 
am: 94ea878ae0

Change-Id: Id6d0080e22f6cbbcd133bdb4bc7e061778fa6fbe
 2017-12-07 06:22:44 +00:00
Colin Cross 2ea0ecdbfe Merge "Add java modules to soong_to_convert.txt" 
am: fedcf41cc3

Change-Id: I50b48601ae48691e4bff2e142974b475a4e9a86d
 2017-12-07 06:21:52 +00:00
Xin Li e0b934c66f Merge "DO NOT MERGE: Merge Oreo MR1 into master" 
am: 5f03da0404  -s ours

Change-Id: Ia35af353516c314e4321fa28f30c02080a83f026
 2017-12-07 06:20:32 +00:00
Xin Li 883c2cb2d0 DO NOT MERGE: Merge Oreo MR1 into master am: 6bbcc2cbd4 -s ours 
am: ce7fb01909

Change-Id: I7cf079d6207e362df26dfe6bf8d8bf357d02f22b
 2017-12-07 06:14:52 +00:00
Treehugger Robot af3984d26d Merge changes Ia7feaa13,Ib917761e 
* changes:
  Add dependency on jacoco-report-classes.jar
  Fix dex_preopt with profile on a soong module
 2017-12-07 04:20:25 +00:00
Treehugger Robot 94ea878ae0 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" 2017-12-07 04:02:29 +00:00
Dan Shi d5424cfa3d Merge "Add build script to generate TF test XML file with filters" am: 0765d53239 am: 515896c436 
am: da1ba69776

Change-Id: I63aaeaede31b47a285173e4a48959600062ed226
 2017-12-07 04:01:42 +00:00
Dan Shi da1ba69776 Merge "Add build script to generate TF test XML file with filters" am: 0765d53239 
am: 515896c436

Change-Id: Id93e51733f0af93aff41e78ce2a1b92e2376befa
 2017-12-07 03:58:20 +00:00
Xin Li ce7fb01909 DO NOT MERGE: Merge Oreo MR1 into master 
am: 6bbcc2cbd4  -s ours

Change-Id: Icf77e28a5794eca1dd8f7210be605abb816956bc
 2017-12-07 03:50:49 +00:00
Dan Shi 515896c436 Merge "Add build script to generate TF test XML file with filters" 
am: 0765d53239

Change-Id: I8ef4cee13232182a01c1bdc0da6afaf9ddd49e01
 2017-12-07 03:49:57 +00:00
David Zeuthen 6fc59b3328 Merge "AVB: If building recovery.img, add AVB hash footer." am: 7b2129f101 am: 0c1c47f700 
am: 3f41c5ff1f

Change-Id: If58ddd497c7b6e8a661cbc312bd519796fbfd5b3
 2017-12-07 03:37:04 +00:00
David Zeuthen 3f41c5ff1f Merge "AVB: If building recovery.img, add AVB hash footer." am: 7b2129f101 
am: 0c1c47f700

Change-Id: I5adecf2f45d308312c545509fd80658f00755883
 2017-12-07 02:17:17 +00:00
Dan Shi 567eede9b6 Create an artifact to include the list of integrated tests in TradeFed 
In TF projects, we can add dir to COMPATIBILITY.tradefed_tests_dir to
include the test names in the artifact, e.g.,
LOCAL_PATH := $(call my-dir)
COMPATIBILITY.tradefed_tests_dir := \
  $(COMPATIBILITY.tradefed_tests_dir) $(LOCAL_PATH)/res/config

Bug: 69678490
Test: m -j dist tradefed-tests-list
Confirm out/dist/tradefed-tests-list.zip exists and has a file
tradefed-tests-list which contains the list of tests.

Change-Id: I67b82e5aeec68e9263bada198669b4a23a0750cb
 2017-12-06 17:19:13 -08:00
Treehugger Robot fedcf41cc3 Merge "Add java modules to soong_to_convert.txt" 2017-12-07 01:04:27 +00:00
Bo Hu 9eb4d74e26 Revert "Renames sepolicy files from nonplat_* to vendor_*" 
This reverts commit 38c404c6da.
Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 		out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

Change-Id: I5b043fc6b5939456184ffb296cd00b3943a899f9
 2017-12-07 00:16:35 +00:00
Colin Cross 8cd412feee Add dependency on jacoco-report-classes.jar 
jacoco-report-classes.jar is found by a glob, so there is no
explicit dependency on it.  Add a dependency to javalib.jar so
that it gets installed.

Bug: 70295664
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true WITH_DEXPREPOT=false
Change-Id: Ia7feaa132879539f88c08a49148e4bbb5a141eab
 2017-12-06 16:12:39 -08:00
Colin Cross d2e54d2362 Fix dex_preopt with profile on a soong module 
The oreo merge to AOSP master added a new variable that must
be set when dex preopting a java module with a profile.

Test: m checkbuild
Change-Id: Ib917761ea4fea481e32f3fb663a18b882a13f4a1
 2017-12-06 16:12:39 -08:00