openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,194 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

39194 Commits

Author SHA1 Message Date
Liz Kammer a801072f60 Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205 am: f84f690929 am: f0946b0715 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640582

Change-Id: I21f5c94906565d2f712199a0cc9826b1b8c35935
 2021-03-17 16:19:39 +00:00
Liz Kammer 16d355ac92 Merge changes from topic "mixed-bp2build" am: a5f86249a4 am: 2b6af78207 am: dd93334831 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607554

Change-Id: Iff4681eca0b887c43f7faccf2e1418671a2f2088
 2021-03-17 16:19:36 +00:00
Jaewoong Jung 300fd07df1 Merge "Improve java.go readability." am: 9f315dea28 am: b163cc04ce am: b348954705 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: Ia988226bd3485f2e716c330fc65c914f6f068037
 2021-03-17 16:19:00 +00:00
Christopher Parsons 944c00991a Merge "Refactor and cleanup of cquery processing" am: bc3f7e0276 am: 70f670df1a am: 8e0d430822 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629139

Change-Id: I08f029d182ef715b64ca5c40944709691a959ad6
 2021-03-17 16:18:52 +00:00
Treehugger Robot 1cf5826a85 Merge "Don't depend on nonexistent manifest when manifest_check is disabled." am: 8974f1706e am: da4eb03a9d am: 7be2dbdc41 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640322

Change-Id: I6d8aeccc36dbe0853b07363d742920e52130d027
 2021-03-17 16:18:45 +00:00
Paul Duffin 8d660568b9 Merge "Fix hiddenapi tests to work without javaMockFS()" am: 248f386558 am: 609df5c2ca am: db6fe68b71 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634630

Change-Id: I9a7fbffaf9e8a3c638cbc34b0567447dc02bb4b7
 2021-03-17 16:18:37 +00:00
Paul Duffin b9a4a0c6dd Merge "Convert hiddenapi tests to use test fixtures" am: af0379ca9c am: 5308375fd4 am: 1a2f26004a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634629

Change-Id: I24182aca5356301804ce068ffa5fe17e91c77af8
 2021-03-17 16:18:30 +00:00
Paul Duffin 6ade27941a Merge "Fix TestJavaSdkLibrary... tests to work without javaMockFS()" am: ebca5e6a68 am: a6ece5dde2 am: 971fbecedd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634628

Change-Id: Ib3ec5e55a91dbb5883c1c53154c91a32dbd6a5ee
 2021-03-17 16:18:23 +00:00
Paul Duffin 5df5ad660d Merge "Convert JavaSdkLibrary... tests in java package to test fixtures" am: fb3fc0cf40 am: dcdefb6b53 am: b75252399c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634627

Change-Id: I272a50cea888cf1db902e29c647072bca4f308f2
 2021-03-17 16:18:16 +00:00
Justin DeMartino 89bcfecf6a Merge "Allow extending of the list of directories to be scanned for VSDK" am: dd1decf7f6 am: e7c7a5e8d6 am: 1bbe7b54ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1603623

Change-Id: I749bf59c09bc250e342953b4760695408aa8b513
 2021-03-17 16:18:07 +00:00
Paul Duffin cdad455200 Merge "Migrate sh package to a per test build directory" am: a36d0dc2b7 am: dd7a42a321 am: 05a103c073 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636432

Change-Id: I64dbecf93e17eb8ae34dba16aa4f964688864996
 2021-03-17 16:17:57 +00:00
Paul Duffin ad56bd7f07 Merge changes I0f516efd,I668f083b,Ifa70acad am: 768f10ac78 am: f7740dcb1a am: de2569a1d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636431

Change-Id: I2b6da5f723a75ff7eaac618dddbbee2bef58be49
 2021-03-17 16:17:50 +00:00
Paul Duffin 7fa523a7a9 Merge "Add (String)Path(s)RelativeToTop and assert functions" am: 6dcd2bfaa5 am: 160fde0333 am: 82f76c4dcf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636428

Change-Id: I0807404ebb5ee18c84904ac7ce8eaf726bab8907
 2021-03-17 16:17:41 +00:00
Ulyana Trafimovich 6256f66cd9 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: 2002bfa817 am: 8bd0efdef8 am: 072f40803f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614807

Change-Id: Ic40dfb25a6e02582ce1399f872cc149bf958cab4
 2021-03-17 16:17:29 +00:00
Artur Satayev e4ceec3bfa [automerger skipped] Move allowed_deps.txt to packages/modules/common. am: 8f0436697c -s ours 
am skip reason: skip tag Change-Id I8e8864468b87342c688d001bc5f6e6f8416863ed with SHA-1 8dfcbe466c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13898788

Change-Id: Ie805b4dbf33c483513b63b3b3a6db76ad1160867
 2021-03-17 14:18:44 +00:00
Artur Satayev 8f0436697c Move allowed_deps.txt to packages/modules/common. 
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I8e8864468b87342c688d001bc5f6e6f8416863ed
Merged-In: I8e8864468b87342c688d001bc5f6e6f8416863ed
(cherry picked from commit 732d6264210513b971205b5c9f1b2f49b9cafdf3)
(cherry picked from commit 8dfcbe466c)
 2021-03-17 11:32:42 +00:00
Bob Badour e5756a4c9b [automerger skipped] Minimal license feature. am: dc5be9099b -s ours am: faa34da8f4 -s ours 
am skip reason: skip tag Change-Id If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b with SHA-1 780599ece2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13879853

Change-Id: Ib2980780bb4cec1025db6b52a3fd031e86d7e5de
 2021-03-16 23:58:32 +00:00
Bob Badour faa34da8f4 [automerger skipped] Minimal license feature. am: dc5be9099b -s ours 
am skip reason: skip tag Change-Id Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed with SHA-1 5553f7fb61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13879853

Change-Id: Iba6877d032020d086a99ed13e6dcdf50302c47db
 2021-03-16 23:20:19 +00:00
Liz Kammer f0946b0715 Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205 am: f84f690929 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640582

Change-Id: I81922d74dedadca33819c479f2715b5a98cfd60f
 2021-03-16 22:35:11 +00:00
Liz Kammer dd93334831 Merge changes from topic "mixed-bp2build" am: a5f86249a4 am: 2b6af78207 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607554

Change-Id: I77644f950488e2d422497a274f584365f54c6dd0
 2021-03-16 22:35:08 +00:00
Jaewoong Jung b348954705 Merge "Improve java.go readability." am: 9f315dea28 am: b163cc04ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: Ia0b76e8b4bb0c366a9254052e2f2fe5bfc74701d
 2021-03-16 22:34:59 +00:00
Christopher Parsons 8e0d430822 Merge "Refactor and cleanup of cquery processing" am: bc3f7e0276 am: 70f670df1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629139

Change-Id: I51364b6e51731743fb37abcb5043622aeecc8e75
 2021-03-16 22:34:47 +00:00
Liz Kammer f84f690929 Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640582

Change-Id: I7097cbeda45737ebec339ec4d4a51f4ea3d3fa7d
 2021-03-16 21:54:54 +00:00
Liz Kammer 2b6af78207 Merge changes from topic "mixed-bp2build" am: a5f86249a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607554

Change-Id: Ife9676229ca007e495bf9ed54d877f4d2cb3b9ea
 2021-03-16 21:54:50 +00:00
Jaewoong Jung b163cc04ce Merge "Improve java.go readability." am: 9f315dea28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: I6194d9aec2579cad62d497298c888d35f3d70cff
 2021-03-16 21:54:34 +00:00
Christopher Parsons 70f670df1a Merge "Refactor and cleanup of cquery processing" am: bc3f7e0276 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629139

Change-Id: I547f447372fbc4b40e72eef2d4f9f9c72fef47e6
 2021-03-16 21:53:42 +00:00
Liz Kammer 39d3830205 Merge "Temporarily disable cc_objects in mixed builds" 2021-03-16 21:40:04 +00:00
Liz Kammer a5f86249a4 Merge changes from topic "mixed-bp2build" 
* changes:
  Support autoconverted modules in mixed builds
  Use handcrafted build targets in bp2build
 2021-03-16 21:40:04 +00:00
Jaewoong Jung 9f315dea28 Merge "Improve java.go readability." 2021-03-16 21:32:48 +00:00
Christopher Parsons bc3f7e0276 Merge "Refactor and cleanup of cquery processing" 2021-03-16 21:12:01 +00:00
Treehugger Robot 7be2dbdc41 Merge "Don't depend on nonexistent manifest when manifest_check is disabled." am: 8974f1706e am: da4eb03a9d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640322

Change-Id: I493923edaea177492800a001dfd80a7d3ea17c3d
 2021-03-16 21:11:26 +00:00
Treehugger Robot da4eb03a9d Merge "Don't depend on nonexistent manifest when manifest_check is disabled." am: 8974f1706e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640322

Change-Id: Ifdc914d783cca30b21f94e20d5da54a948536b75
 2021-03-16 20:34:12 +00:00
Treehugger Robot 8974f1706e Merge "Don't depend on nonexistent manifest when manifest_check is disabled." 2021-03-16 20:02:42 +00:00
Liz Kammer bdc609972c Support autoconverted modules in mixed builds 
modules converted with bp2build_available are will also be available to
be used in mixed builds.

Test: build/bazel/scripts/milestone-2/demo.sh full
Test: go tests
Change-Id: I49f16ec3ba5bb11dfed8066af069c27eb04371fb
 2021-03-16 15:11:49 -04:00
Bob Badour dc5be9099b Minimal license feature. 
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
 2021-03-16 18:53:03 +00:00
Chris Parsons 944e7d01aa Refactor and cleanup of cquery processing 
Test: USE_BAZEL_ANALYSIS=1 m libc
Change-Id: Iaf9a92e84d39c132e2444a8aaafd79505a12b8ec
 2021-03-16 14:39:16 -04:00
TreeHugger Robot 1d5f113b62 [automerger skipped] Merge "Add hansson@ to OWNERS in mainline-prod." into mainline-prod am: 2400302b8c -s ours 
am skip reason: Change-Id I5a4b2d252bd9b3c280cd9954cf0e65ac21153ede with SHA-1 a80b480eea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13886728

Change-Id: Idff71da7c1fd69eca05d237460e5bea2bf674af7
 2021-03-16 18:25:33 +00:00
Artur Satayev a4a29122ef [automerger skipped] Don't track modules that are only available to APEXes. am: 55bf387f54 -s ours 
am skip reason: Change-Id I10b91053b3ef5a9ff5400d9d7a68fae3144a671c with SHA-1 533b98cde3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13886725

Change-Id: I551318a0437224b874140b1606342f795ca8c4b9
 2021-03-16 18:05:38 +00:00
TreeHugger Robot a089ef0de4 Merge "Move allowed_deps.txt to packages/modules/common." into sc-dev 2021-03-16 17:45:34 +00:00
Liz Kammer 57355683d4 Temporarily disable cc_objects in mixed builds 
Bug: 181794963
Test: generate bp2build targets and run mixed builds
Change-Id: If4562fe8ed7bde88141b40166eca9d01f6538106
 2021-03-16 13:34:48 -04:00
Paul Duffin cdf2426d76 Switch platform_compat_config to use common arch am: 4defbf4d39 am: 75c51ba191 am: e9292b1459 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638281

Change-Id: I43f4b4ff67f19326ba4124a4ed86ef4ce86feaef
 2021-03-16 17:30:06 +00:00
TreeHugger Robot 2400302b8c Merge "Add hansson@ to OWNERS in mainline-prod." into mainline-prod 2021-03-16 17:06:16 +00:00
Paul Duffin db6fe68b71 Merge "Fix hiddenapi tests to work without javaMockFS()" am: 248f386558 am: 609df5c2ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634630

Change-Id: Ie65ddae0cde35a55da648eebd2ea76a37498963e
 2021-03-16 16:20:24 +00:00
Paul Duffin 1a2f26004a Merge "Convert hiddenapi tests to use test fixtures" am: af0379ca9c am: 5308375fd4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634629

Change-Id: Ib6affe3d3dfa3808527aee36e4ce93c8e82283d3
 2021-03-16 16:20:20 +00:00
Paul Duffin 971fbecedd Merge "Fix TestJavaSdkLibrary... tests to work without javaMockFS()" am: ebca5e6a68 am: a6ece5dde2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634628

Change-Id: Ieeb6d2e683a7b401a5d63c61085ca6e9110756a8
 2021-03-16 16:20:16 +00:00
Paul Duffin b75252399c Merge "Convert JavaSdkLibrary... tests in java package to test fixtures" am: fb3fc0cf40 am: dcdefb6b53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634627

Change-Id: Ib14f15d4b27741b92f51a2a17d738c993da88505
 2021-03-16 16:20:12 +00:00
Justin DeMartino 1bbe7b54ec Merge "Allow extending of the list of directories to be scanned for VSDK" am: dd1decf7f6 am: e7c7a5e8d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1603623

Change-Id: I90ee8cf8666361550b493cd5fe9082f719378baf
 2021-03-16 16:20:02 +00:00
Paul Duffin 05a103c073 Merge "Migrate sh package to a per test build directory" am: a36d0dc2b7 am: dd7a42a321 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636432

Change-Id: I58d5c9fd54ff733f1e7780cd6f92889b2b0b1c9f
 2021-03-16 16:19:55 +00:00
Paul Duffin de2569a1d8 Merge changes I0f516efd,I668f083b,Ifa70acad am: 768f10ac78 am: f7740dcb1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636431

Change-Id: I8e35ebb813f5c79c4b57be9e4c748a545aa37f27
 2021-03-16 16:19:51 +00:00
Paul Duffin 82f76c4dcf Merge "Add (String)Path(s)RelativeToTop and assert functions" am: 6dcd2bfaa5 am: 160fde0333 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636428

Change-Id: I02f4b35298de5d344fc2d99a11f28ff726e58b96
 2021-03-16 16:19:42 +00:00