Commit Graph

52409 Commits

Author SHA1 Message Date
Treehugger Robot
f2259d112e Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac am: 061abc7259 am: 49753eca77 am: 086a0913aa am: 9b378e1739
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875854

Change-Id: I6e1cfe6f293ccc20f8b612e9996ca2b802289b57
2021-11-01 19:50:17 +00:00
Treehugger Robot
9b378e1739 Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac am: 061abc7259 am: 49753eca77 am: 086a0913aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875854

Change-Id: I189b0c63507e1d85a42aec7e546b5fa7d318915d
2021-11-01 19:30:00 +00:00
Treehugger Robot
086a0913aa Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac am: 061abc7259 am: 49753eca77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875854

Change-Id: I0df294128a7789684481055fe18b7b6d3e38b416
2021-11-01 19:20:16 +00:00
TreeHugger Robot
72db73db24 Merge "Remove duplicate optional_uses_libs block" 2021-11-01 19:00:23 +00:00
Treehugger Robot
49753eca77 Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac am: 061abc7259
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875854

Change-Id: Ie794197f49ea4825f477d34cea074efe5f1169ff
2021-11-01 18:53:07 +00:00
Treehugger Robot
f93603d970 Merge "Make manifest_check errors colorful." am: 0888700fe1 am: d2a38198e0 am: 074031e402 am: 02c857bdd0 am: da0b0b96df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877316

Change-Id: Id554a64f5d94ccb9802bb5208222909b3937918c
2021-11-01 18:44:47 +00:00
Treehugger Robot
061abc7259 Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875854

Change-Id: I2bfef4479f413f4eca23a831612b4277e27c49c3
2021-11-01 18:27:36 +00:00
Treehugger Robot
da0b0b96df Merge "Make manifest_check errors colorful." am: 0888700fe1 am: d2a38198e0 am: 074031e402 am: 02c857bdd0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877316

Change-Id: I7f446724e956fc02087bb4de6c396f243530a587
2021-11-01 18:26:13 +00:00
Treehugger Robot
57be76d9ac Merge changes I346ac9c0,I57352aa0
* changes:
  Make prebuilt_api test environment realistic
  Add test for prebuilt_apis creation of system modules
2021-11-01 18:11:06 +00:00
Treehugger Robot
02c857bdd0 Merge "Make manifest_check errors colorful." am: 0888700fe1 am: d2a38198e0 am: 074031e402
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877316

Change-Id: I00a5d1e166147d14fb16163132d9a1cab9ecbe3b
2021-11-01 18:08:49 +00:00
Treehugger Robot
074031e402 Merge "Make manifest_check errors colorful." am: 0888700fe1 am: d2a38198e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877316

Change-Id: Ic76f22379b2c6c1586f89c8bcf4669621c1db53e
2021-11-01 17:46:53 +00:00
Paul Duffin
460cbb7180 Dist API specific core-for-system-modules am: bce9f08d02 am: 381f698843 am: 9474d1a187 am: 245849abe6 am: 37ee2b187c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873693

Change-Id: I3dce5ae019b72961b4a63fccac631d3461d20ed1
2021-11-01 17:34:19 +00:00
Treehugger Robot
d2a38198e0 Merge "Make manifest_check errors colorful." am: 0888700fe1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877316

Change-Id: Idd8323833406b0e358abb947c615ff889ccf1d11
2021-11-01 17:29:05 +00:00
Paul Duffin
37ee2b187c Dist API specific core-for-system-modules am: bce9f08d02 am: 381f698843 am: 9474d1a187 am: 245849abe6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873693

Change-Id: Ia77a97ebfc6be2fedde44fe4f61735e3c1b7574e
2021-11-01 17:16:08 +00:00
Treehugger Robot
0888700fe1 Merge "Make manifest_check errors colorful." 2021-11-01 17:11:52 +00:00
Paul Duffin
245849abe6 Dist API specific core-for-system-modules am: bce9f08d02 am: 381f698843 am: 9474d1a187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873693

Change-Id: Ib930f158b2cd943a0ea2dab2408c5b2c310851fe
2021-11-01 16:56:35 +00:00
Paul Duffin
9474d1a187 Dist API specific core-for-system-modules am: bce9f08d02 am: 381f698843
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873693

Change-Id: I51465180108017ffe8f492b909a53056a3807ac0
2021-11-01 16:44:12 +00:00
Paul Duffin
1cad3a53db Make prebuilt_api test environment realistic
Previously, the fixture preparer for prebuilt_apis would add a
core-for-system-modules.jar file in every API directory even though
currently they only exist in the public API directories.

This change makes the test environment more realistic by only creating
them for the public API. Rather than hard code that into the test code
(which would duplicate the hard coding in the decodeSdkDep func) this
extracts a function that is used by both. That ensures that any changes
to that func will be reflected in both the test and runtime behavior.

Bug: 204189791
Test: m nothing
Change-Id: I346ac9c0dcf407c61de16b6027663a05821bcf62
2021-11-01 16:36:23 +00:00
Paul Duffin
6d448b7a0a Add test for prebuilt_apis creation of system modules
Previously, there were no tests for this (outside uses in other tests).
This change adds a test that uses the fixture preparers that create a
prebuilt_api in order to make prebuilt APIs available. That ensures
that both the prebuilt_api is working as expected and the preparer
creates a realistic test environment.

Bug: 204189791
Test: m nothing
Change-Id: I57352aa00f7b268e5286be92f177764dd63ba7e8
2021-11-01 16:36:02 +00:00
Paul Duffin
381f698843 Dist API specific core-for-system-modules am: bce9f08d02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873693

Change-Id: Ic4206df7453370b3073a4656843d1bfadafadf8b
2021-11-01 16:13:34 +00:00
Ulya Trafimovich
b4c19f8a31 Make manifest_check errors colorful.
Insert ANSI escape codes in the error text. Colors are red, blue, green
and some text is in bold --- these are all bright enough on either dark
or light background.

Also, add a link to the online documentation.

Bug: 132357300
Test: manually mangle one of Android.bp files to get a manifest_check
  error and observe that it is colorful.
Change-Id: I2af2aa0415d0eb0eabc88dc5504198e11bfb91b6
2021-11-01 14:39:46 +00:00
Alan Viverette
8d22c2ed1b Remove duplicate optional_uses_libs block
Change-Id: I58e8484482a77cefd3f66076f4a04b720cf173c7
Fixes: 204589171
2021-11-01 14:23:51 +00:00
Paul Duffin
bce9f08d02 Dist API specific core-for-system-modules
Previously, the dist only contained a core-for-system-modules.jar for
the public API. This change adds API specific directories containing a
core-for-system-modules.jar file for each of the following APIs:
* public
* module-lib

Bug: 204189791
Test: rm -fr out/dist
      m sdk dist
      find out/dist -name core-for-system-modules.jar
      - outputted the following:
      out/dist/core-for-system-modules.jar
      out/dist/system-modules/module-lib/core-for-system-modules.jar
      out/dist/system-modules/public/core-for-system-modules.jar
Change-Id: Id1845926e2085f70d58e9fc22e9c11cb3d62b919
2021-11-01 14:01:39 +00:00
Joe Onorato
a6606c49b3 Merge "Add support for java streaming proto" am: 22e973c539 am: a224d53694 am: c1ce0ed41c am: 6cc658af6b am: 14448b4d76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874416

Change-Id: I6b2c5cd34d61dbb4fa313c86c81505866d9110de
2021-11-01 01:21:53 +00:00
Joe Onorato
14448b4d76 Merge "Add support for java streaming proto" am: 22e973c539 am: a224d53694 am: c1ce0ed41c am: 6cc658af6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874416

Change-Id: I1f26754b6a544975fa53f418c7b96f6ffb0cf408
2021-11-01 01:09:15 +00:00
Joe Onorato
6cc658af6b Merge "Add support for java streaming proto" am: 22e973c539 am: a224d53694 am: c1ce0ed41c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874416

Change-Id: Iebb924867b3600343832ab63ca47870194ee5f24
2021-11-01 00:52:10 +00:00
Joe Onorato
c1ce0ed41c Merge "Add support for java streaming proto" am: 22e973c539 am: a224d53694
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874416

Change-Id: I2898febfd2f709d07bef0b92b9f067ead51a3910
2021-11-01 00:40:40 +00:00
Joe Onorato
a224d53694 Merge "Add support for java streaming proto" am: 22e973c539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874416

Change-Id: I2b61650dee7adddcd3ce116a2dfd5b7ceb587ee4
2021-11-01 00:26:18 +00:00
Joe Onorato
22e973c539 Merge "Add support for java streaming proto" 2021-11-01 00:14:59 +00:00
Colin Cross
25f69e8278 Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0 am: 204c59ef91 am: e097970ad8 am: ac0c4570bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: I01b8b582aa53394710f71eb74df28054fafde04f
2021-10-30 20:54:49 +00:00
Colin Cross
ac0c4570bc Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0 am: 204c59ef91 am: e097970ad8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: Ibe28eedaac9545d551d1d13a490b7f2e9ed004bb
2021-10-30 20:41:07 +00:00
Colin Cross
e097970ad8 Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0 am: 204c59ef91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: I30301ab035b28f654b2510fbc28be4003a5ec346
2021-10-30 20:30:46 +00:00
Colin Cross
204c59ef91 Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: I512a0433e8517e7062fb9929e2f80d48ae23036b
2021-10-30 19:55:35 +00:00
Colin Cross
19aa461cc0 Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: Ida831ee9684ce97052443a012d5c4986c0d4399c
2021-10-30 19:37:28 +00:00
Colin Cross
91eaa6316a Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3
* changes:
  Rename amod variable in AndroidMkEntries.fillInEntries to base
  Make HostToolPath, HostJNIToolPath and sboxPathForToolRel use pathForInstall
  Add PathForGoBinary
  Remove PathForOutput from InstallPathToOnDevicePath
2021-10-30 19:19:53 +00:00
Colin Cross
4b965682e6 Merge "Use --skip-config --soong-only instead of --skip-make" am: e7fc5a25c5 am: 814909b0f3 am: f9b1f0b3d0 am: a90c335bbe am: d91c4c07e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875216

Change-Id: I95f3343d2ba1158309c4457c7209a55fbfe1e89a
2021-10-30 17:36:17 +00:00
Colin Cross
d91c4c07e2 Merge "Use --skip-config --soong-only instead of --skip-make" am: e7fc5a25c5 am: 814909b0f3 am: f9b1f0b3d0 am: a90c335bbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875216

Change-Id: If938410481f1e6b4e54f637a8bf9056ea5125864
2021-10-30 17:05:05 +00:00
Colin Cross
a90c335bbe Merge "Use --skip-config --soong-only instead of --skip-make" am: e7fc5a25c5 am: 814909b0f3 am: f9b1f0b3d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875216

Change-Id: I16b442db90929cb1c2da3c3161b79803302400d1
2021-10-30 16:48:36 +00:00
Colin Cross
f9b1f0b3d0 Merge "Use --skip-config --soong-only instead of --skip-make" am: e7fc5a25c5 am: 814909b0f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875216

Change-Id: I383e03d4fec215afdf5a4f344364d6eed3aa9a99
2021-10-30 16:30:53 +00:00
Colin Cross
814909b0f3 Merge "Use --skip-config --soong-only instead of --skip-make" am: e7fc5a25c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875216

Change-Id: I3da344ae1c31d292b7e1ef446151893b723a88f5
2021-10-30 16:13:21 +00:00
Colin Cross
e7fc5a25c5 Merge "Use --skip-config --soong-only instead of --skip-make" 2021-10-30 15:56:22 +00:00
Colin Cross
535a392cc8 Merge "Make installable arch-variant and static vs shared variant for cc modules" am: 4985224198 am: 5dc0ab4daa am: 385517b48d am: b24afb8f67 am: ac4cef36df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874552

Change-Id: Ib4dbbb955fd1b2ae8117d962b3da0c4e4a52dfd1
2021-10-30 06:30:22 +00:00
Colin Cross
ac4cef36df Merge "Make installable arch-variant and static vs shared variant for cc modules" am: 4985224198 am: 5dc0ab4daa am: 385517b48d am: b24afb8f67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874552

Change-Id: I96dff8087c5290b30d0d9cb0e04dfbf20bba51c9
2021-10-30 06:12:01 +00:00
Colin Cross
b24afb8f67 Merge "Make installable arch-variant and static vs shared variant for cc modules" am: 4985224198 am: 5dc0ab4daa am: 385517b48d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874552

Change-Id: I3569ce5bd3836806049d8f4b1abfac58d0438070
2021-10-30 05:42:33 +00:00
Colin Cross
385517b48d Merge "Make installable arch-variant and static vs shared variant for cc modules" am: 4985224198 am: 5dc0ab4daa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874552

Change-Id: I7bdfd8ec00a798076d00a5b893bf54397a0e6e0f
2021-10-30 05:25:40 +00:00
Chih-hung Hsieh
2fe0804ed2 Merge "Add -{checkbuild,tidy} targets only for modules in mm" am: 7b2239f648 am: 6ac43742fc am: 8044ebf38b am: 9b872ac262 am: 5722592c6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858736

Change-Id: I3fde0d7bc0b47dcb7f743f97087d9c83c2b220e8
2021-10-30 05:24:49 +00:00
Colin Cross
5dc0ab4daa Merge "Make installable arch-variant and static vs shared variant for cc modules" am: 4985224198
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874552

Change-Id: I076443da26723441f0534187d686cee2ed4b8a88
2021-10-30 05:13:17 +00:00
Chih-hung Hsieh
5722592c6a Merge "Add -{checkbuild,tidy} targets only for modules in mm" am: 7b2239f648 am: 6ac43742fc am: 8044ebf38b am: 9b872ac262
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858736

Change-Id: I3f4649b20d93b7509ccdf1accdd227d4dc152173
2021-10-30 05:11:49 +00:00
Colin Cross
4985224198 Merge "Make installable arch-variant and static vs shared variant for cc modules" 2021-10-30 04:56:22 +00:00
Chih-hung Hsieh
9b872ac262 Merge "Add -{checkbuild,tidy} targets only for modules in mm" am: 7b2239f648 am: 6ac43742fc am: 8044ebf38b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858736

Change-Id: Ief9c7ed6f55e8b8528dd8874ddc41a90ea2551ea
2021-10-30 04:55:15 +00:00