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

41755 Commits

Author SHA1 Message Date
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
Stephen Li 813b511529 Manually merge changes from giant AOSP topic 
Change-Id: I77f2407fb5223146c450f99516fbca55ab3aa900
 2017-12-07 23:29:16 +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 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 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
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
Treehugger Robot fedcf41cc3 Merge "Add java modules to soong_to_convert.txt" 2017-12-07 01:04:27 +00:00
David Zeuthen 0c1c47f700 Merge "AVB: If building recovery.img, add AVB hash footer." 
am: 7b2129f101

Change-Id: I6b95aeb50a99a41831af4aa6374df3a6e8309ca4
 2017-12-06 23:59:52 +00:00
Colin Cross 3277ba34ae Add java modules to soong_to_convert.txt 
Test: examine soong_to_convert.txt
Change-Id: Ibb6db664238a4e98f5d8885dfb3ddc0f35d11ff6
 2017-12-06 15:38:52 -08:00
Xin Li 5f03da0404 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:30 +00:00
Treehugger Robot 0765d53239 Merge "Add build script to generate TF test XML file with filters" 2017-12-06 22:51:43 +00:00
Xin Li 6bbcc2cbd4 DO NOT MERGE: Merge Oreo MR1 into master 
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Idcd6eeddfdeec156f0e19e617129561c33d32fdc
 2017-12-06 14:24:42 -08:00
Jeff Gaston 2936701ffe Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663 am: a659799786 
am: c0715eb231

Change-Id: I5dd7a5d83dc085c7f2756b76ca409c99e9cca5f0
 2017-12-06 22:21:38 +00:00
Treehugger Robot 7b2129f101 Merge "AVB: If building recovery.img, add AVB hash footer." 2017-12-06 22:12:25 +00:00
Jeff Gaston c0715eb231 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663 
am: a659799786

Change-Id: I878bdedce803df1b4e74c429901e1e04b7d73002
 2017-12-06 21:43:29 +00:00
Jeff Gaston a659799786 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 
am: 5313503663

Change-Id: Iefc4b4cecb6f22b39ec66675fffe65ac62a18e79
 2017-12-06 21:37:10 +00:00
Jeff Gaston 5313503663 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 2017-12-06 21:28:28 +00:00
Badash c84418f66d initial add sts to build am: bb7a920294 am: b4bd17c9ad am: 2f8a8b8a18 
am: d269f266aa

Change-Id: If158bd1903e9e7d828a2ad3ca471faee1f98c3b4
 2017-12-06 18:51:54 +00:00
Badash d269f266aa initial add sts to build am: bb7a920294 am: b4bd17c9ad 
am: 2f8a8b8a18

Change-Id: I34a6d4c7e16c0340d0a74bb1bcc2a29a2e850b1e
 2017-12-06 18:34:32 +00:00
Badash 2f8a8b8a18 initial add sts to build am: bb7a920294 
am: b4bd17c9ad

Change-Id: I94ff95c77545981dfe7e466e4e1a105f45e38472
 2017-12-06 18:19:05 +00:00
Badash b4bd17c9ad initial add sts to build 
am: bb7a920294

Change-Id: I63038aeb98fa6008e1217f8caf7ec749a0ea749e
 2017-12-06 18:16:11 +00:00
Tobias Thierer 54254f5f4a Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: 2ea4ed5911 am: a363f249e9 
am: e8ef654e04

Change-Id: Ie78a7847aca32799a767d2bbc8ff49e6407e577f
 2017-12-06 14:19:08 +00:00
Tobias Thierer e8ef654e04 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: 2ea4ed5911 
am: a363f249e9

Change-Id: Iaa4ff98107045f5b3ffd19be8dcb61b168ebf7f1
 2017-12-06 14:13:21 +00:00
Tobias Thierer a363f249e9 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" 
am: 2ea4ed5911

Change-Id: I0fd225966b98a212b8c9712a4942cfe3e8bd9dc2
 2017-12-06 14:09:31 +00:00
Tobias Thierer 2ea4ed5911 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" 2017-12-06 14:00:47 +00:00
Tobias Thierer 3d4065026a Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: d4760b3eed am: d148a93adc 
am: 864b81d466

Change-Id: I282dc8d54ff080c4bb54bae9a595424d45f7df24
 2017-12-06 11:22:27 +00:00
Tobias Thierer 864b81d466 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: d4760b3eed 
am: d148a93adc

Change-Id: Ia97ae88d072e1698bab9f7a15858f1a10bc015d6
 2017-12-06 11:16:12 +00:00
Tobias Thierer d148a93adc Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 
am: d4760b3eed

Change-Id: I051acf7e54d1fcbaf18943b11436d8566a2568a7
 2017-12-06 11:09:39 +00:00
Tobias Thierer d4760b3eed Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-06 11:05:31 +00:00
kaichieh cf2faa444f Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 291768ef7f am: 24ed707951 
am: 696e4eb092

Change-Id: I8abbcc4df479e4d05e7a41f632f12d87f1cbf083
 2017-12-06 10:30:17 +00:00
kaichieh 696e4eb092 Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 291768ef7f 
am: 24ed707951

Change-Id: If5bbb6e9dd954babaedbd060359dfa11d86b7ea3
 2017-12-06 10:22:17 +00:00
kaichieh 24ed707951 Merge "Renames sepolicy files from nonplat_* to vendor_*" 
am: 291768ef7f

Change-Id: Id4b56219d64a75c3697d7ab3aa9ea9223d40355e
 2017-12-06 10:11:32 +00:00
Treehugger Robot 291768ef7f Merge "Renames sepolicy files from nonplat_* to vendor_*" 2017-12-06 10:00:46 +00:00
Jiyong Park a21dace22b Merge "Don't embed vendor libs into vendor apks." am: 30c0278ae1 am: 65552d3c1d 
am: ad0cb5a379

Change-Id: Ie88d4295c00f3210bb18eefdb2e1b30d49310a20
 2017-12-06 04:33:50 +00:00
Jiyong Park ad0cb5a379 Merge "Don't embed vendor libs into vendor apks." am: 30c0278ae1 
am: 65552d3c1d

Change-Id: I9edb24d2edceb9614573e797000e694d11bc7cc2
 2017-12-06 04:27:14 +00:00
Jiyong Park 65552d3c1d Merge "Don't embed vendor libs into vendor apks." 
am: 30c0278ae1

Change-Id: I16d8a9371b6ea699f22781eda61c345537bd73ef
 2017-12-06 04:23:04 +00:00
Treehugger Robot 30c0278ae1 Merge "Don't embed vendor libs into vendor apks." 2017-12-06 04:14:43 +00:00
Jae Shin 4d94931433 Merge "Remove path prefix within VNDK snapshot zip" am: 18e945fb6e am: ca989663e9 
am: ebb2842dee

Change-Id: Ia4161bb67766e6b364fda59f8df6b156232f9452
 2017-12-06 04:13:26 +00:00
Jae Shin ebb2842dee Merge "Remove path prefix within VNDK snapshot zip" am: 18e945fb6e 
am: ca989663e9

Change-Id: I28583d42fc8114698eb204668c8583a3ab8e61b8
 2017-12-06 03:58:12 +00:00
Jae Shin ca989663e9 Merge "Remove path prefix within VNDK snapshot zip" 
am: 18e945fb6e

Change-Id: I01b1f989c1e056e7aa5ad664d82cbb65658d4eeb
 2017-12-06 03:40:36 +00:00
Treehugger Robot 18e945fb6e Merge "Remove path prefix within VNDK snapshot zip" 2017-12-06 02:25:49 +00:00