StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,778 Commits 1 Branch 0 Tags
dee1a86a44c4e09be9fca3fa23e1933f91944dda
Commit Graph

46778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
dee1a86a44 Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... am: 02ce1e7833 am: 6ea1d5be60 am: e68193dcbc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885956

Change-Id: I59d963fd3895d228dc5da405ebf2086acfad514d
 2021-11-10 19:40:32 +00:00
Colin Cross
e68193dcbc Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... am: 02ce1e7833 am: 6ea1d5be60 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885956

Change-Id: If9c1d6b7f6be8b4d9f4960772baa29de25841af3
 2021-11-10 19:23:07 +00:00
Colin Cross
6ea1d5be60 Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... am: 02ce1e7833 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885956

Change-Id: Id5f2522e8e488aaa69f06a2c01f0443f9cbf1e16
 2021-11-10 19:05:11 +00:00
Colin Cross
02ce1e7833 Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... 
* changes:
  Fix InstallBypassMake symlink dependencies
  Add tests for ctx.InstallFile
  Fix OutDir vs SoongOutDir in tests
  Fix go vet error
  Add missing os.MkdirAll to WriteFileToOutputDir
  Use pathtools.WriteFileIfChanged in translateAndroidMk
 2021-11-10 18:49:08 +00:00
Treehugger Robot
24d29272be Merge "Add symlinks to Soong-installed sh_binary" am: 3d3aa7038b am: 6568ea9f2a am: d8cf4ab4a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886234

Change-Id: I288a9dea3e7fc2b0b1dc9c2b525154e96a1ce961
 2021-11-10 18:47:06 +00:00
Treehugger Robot
d8cf4ab4a8 Merge "Add symlinks to Soong-installed sh_binary" am: 3d3aa7038b am: 6568ea9f2a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886234

Change-Id: I176804147a67cc7e0dcee3a571ef8df23ec3bce7
 2021-11-10 18:16:40 +00:00
Treehugger Robot
6568ea9f2a Merge "Add symlinks to Soong-installed sh_binary" am: 3d3aa7038b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886234

Change-Id: I029e89173d4529d940cf4df50ab529faa7ad03ba
 2021-11-10 18:05:51 +00:00
Lukács T. Berki
2d5e34c183 Merge "Make bgplob an exception to dangling rule check." am: 9303cd6f87 am: ea3a89b78b am: f5f673702c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885517

Change-Id: I788279e4e58d75fb2bef2d721074e04e7d867c15
 2021-11-10 17:53:18 +00:00
Treehugger Robot
3a075ff1a4 Merge changes from topic "soong-java-install" am: 8a709b149b am: 03a3ea3885 am: 932eda33a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881031

Change-Id: If6b71ee65592b78e31f63ea4553b0a905402d401
 2021-11-10 17:52:43 +00:00
Colin Cross
29c7bdd685 Move java module installation into Soong am: 24cc4be60b am: e2d3d87fcd am: 865a62d8ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880650

Change-Id: Idddd29c5fe84c8496ed5b8ce2c908b8c32f95880
 2021-11-10 17:52:42 +00:00
Colin Cross
0978bcd3c1 Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0 am: c871fe905e am: 406461d954 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649

Change-Id: Ibabb7e277a37fc5271d997db52cbe6f5628cc3d2
 2021-11-10 17:52:42 +00:00
Colin Cross
d1d1dea4da Make HostJavaToolPath use pathForInstall am: ae5330a2d9 am: a8bd977845 am: e8aadabe21 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648

Change-Id: I6e0bf0060007a6e86661b7b36ece81a96191cc77
 2021-11-10 17:52:39 +00:00
Treehugger Robot
3d3aa7038b Merge "Add symlinks to Soong-installed sh_binary" 2021-11-10 17:49:26 +00:00
Lukács T. Berki
f5f673702c Merge "Make bgplob an exception to dangling rule check." am: 9303cd6f87 am: ea3a89b78b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885517

Change-Id: Id1c9f4fa31207011b35c7f80f1c3e0f46150497a
 2021-11-10 17:42:06 +00:00
Treehugger Robot
932eda33a7 Merge changes from topic "soong-java-install" am: 8a709b149b am: 03a3ea3885 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881031

Change-Id: Ieab9cca8bdf0b506c251c722e44ad89f8e90173a
 2021-11-10 17:41:28 +00:00
Colin Cross
865a62d8ca Move java module installation into Soong am: 24cc4be60b am: e2d3d87fcd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880650

Change-Id: I8b8c85a7f38e242b8592566923464fdbb0e2f653
 2021-11-10 17:41:27 +00:00
Colin Cross
406461d954 Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0 am: c871fe905e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649

Change-Id: I7448eba4f4e278d7869269009465f632fcf4eddc
 2021-11-10 17:41:26 +00:00
Colin Cross
e8aadabe21 Make HostJavaToolPath use pathForInstall am: ae5330a2d9 am: a8bd977845 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648

Change-Id: I9e89dc97ea860cb58dbc66ee9d67a22aec974046
 2021-11-10 17:41:24 +00:00
Lukács T. Berki
ea3a89b78b Merge "Make bgplob an exception to dangling rule check." am: 9303cd6f87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885517

Change-Id: Ia3838360057d357d44ca958f06ea5ff41f836de0
 2021-11-10 17:29:12 +00:00
Treehugger Robot
03a3ea3885 Merge changes from topic "soong-java-install" am: 8a709b149b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881031

Change-Id: Id24ad8c9c6a27df20323c40fb3b350bc239bb7be
 2021-11-10 17:28:54 +00:00
Colin Cross
e2d3d87fcd Move java module installation into Soong am: 24cc4be60b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880650

Change-Id: I9dfb4e0d5fd387258e5cf4cd9a7b73b4181fba69
 2021-11-10 17:28:53 +00:00
Colin Cross
c871fe905e Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649

Change-Id: I4c74ca35e116674a46cd382a9d856092a76a0e6c
 2021-11-10 17:28:52 +00:00
Colin Cross
a8bd977845 Make HostJavaToolPath use pathForInstall am: ae5330a2d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880648

Change-Id: I0e35100226020451befb3993cf3b3c44b34af010
 2021-11-10 17:28:49 +00:00
Lukács T. Berki
9303cd6f87 Merge "Make bgplob an exception to dangling rule check." 2021-11-10 17:19:44 +00:00
Treehugger Robot
8a709b149b Merge changes from topic "soong-java-install" 
* changes:
  Revert "Temporarily add method to get java binary tool"
  Move java module installation into Soong
  Fix ctx.InstallFile calls for java modules
  Make HostJavaToolPath use pathForInstall
 2021-11-10 17:05:51 +00:00
Lukacs T. Berki
5a67da789d Make bgplob an exception to dangling rule check. 
It's built explicitly by Microfactory but is under out/ and as such, it
would be normally flagged as a file in out/ that doesn't have a
generating rule.

Previously, a no-op rule was added to the Ninja file to prevent this
from happening, but there is no good reason to have two mechanisms to
exempt files under out/ from that check.

Test: Presubmits.
Change-Id: I37fc458ecc5f5734cd81bce2f4894063658df38f
 2021-11-10 12:32:22 +01:00
Laura Tsai
2883262457 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983 am: 463f87c7c5 am: fb1e24c1c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670

Change-Id: Iea757a247c98825ff26c2d164eac090ccfbe2cb0
 2021-11-10 07:48:01 +00:00
Laura Tsai
fb1e24c1c7 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983 am: 463f87c7c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670

Change-Id: Iadd1923b060b8c48f38702fbf9a81720084a4565
 2021-11-10 07:31:51 +00:00
Laura Tsai
463f87c7c5 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670

Change-Id: I5fb3d8d117075783371c55af84991d51479d91ff
 2021-11-10 07:12:40 +00:00
Laura Tsai
33b60e4983 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" 2021-11-10 07:00:38 +00:00
Laura Tsai
be3c7eacfe Revert "Add scripts to generate java APIs used by Mainline modules." 
This reverts commit c92380f001.

Reason for revert:
DroidMonitor:

DroidMonitor-triggered revert due to breakage
https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=mainline_modules_arm64-userdebug&lkgb=7898389&lkbb=7900541&fkbb=7898474,
bug 205746850

Change-Id: Ibd84dfe68dfe150b7e05b4287364d1946375bf72
 2021-11-10 06:59:37 +00:00
Alexander Smundak
8dc707fefd Merge changes Ia41a5a2e,Ib29654e7 am: 45f97c6a1e am: 63861ddea8 am: 19a0e5f55e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883569

Change-Id: Id4fb29615bae5bc64cbd69e26756eb679da6f631
 2021-11-10 02:00:28 +00:00
Alexander Smundak
19a0e5f55e Merge changes Ia41a5a2e,Ib29654e7 am: 45f97c6a1e am: 63861ddea8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883569

Change-Id: I99af4477e2f270b4762253bb6818a30733c76776
 2021-11-10 01:43:11 +00:00
Jooyung Han
120e23ef81 Merge "Pass --min_sdk_version to aidl compiler" am: a5b538394c am: 29b2f3e48a am: 75a0719cbf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883408

Change-Id: Iab14ae29e4d0500fea18ea26937d81f71e181f05
 2021-11-10 01:31:48 +00:00
Colin Cross
64002afc56 Fix InstallBypassMake symlink dependencies 
Host symlinks cannot use order-only dependencies because they may be
used as part of the dependency chain on a tool, and an order-only
dependency would cause the target of the symlink not to be updated.
Use regular dependencies instead.

Bug: 204136549
Fixes: 205674000
Test: TestInstallBypassMake
Change-Id: Ib3f4ee143e94d1995ec6c60d314e7c91e57cc775
 2021-11-09 17:25:57 -08:00
Colin Cross
94bf518932 Add symlinks to Soong-installed sh_binary 
I3f9928c6d6993c381859b80c335b800b1a9769ee moved sh_binary installation
to Soong, but the Soong install rules didn't include the symlinks.

Bug: 204136549
Test: m checkbuild
Change-Id: I8dd663c7d6a3259b397a11787e0869f32d0530cd
 2021-11-09 17:25:57 -08:00
Colin Cross
6ac9576eef Add tests for ctx.InstallFile 
Add tests that cover Soong-only installation as well as installation with
InstallBypassMake.

Bug: 204136549
Test: TestInstall
Test: TestInstallBypassMake
Change-Id: Iac22c9fdf99994e06b419623ee5fa399ef6957fb
 2021-11-09 17:25:57 -08:00
Colin Cross
7b6a55f5a2 Fix OutDir vs SoongOutDir in tests 
Tests were using the same value for OutDir and SoongOutDir, separate
them to allow a test that needs to distinguish between them.

Test: all soong tests
Change-Id: Ibd78758c133a7f07bead3f51b699052676f92fbd
 2021-11-09 17:25:57 -08:00
Colin Cross
85b7eb90d9 Fix go vet error 
Test: none
Change-Id: I40d8696c53f0059424a1a7bf860b760525813605
 2021-11-09 17:25:57 -08:00
Colin Cross
d642113643 Add missing os.MkdirAll to WriteFileToOutputDir 
Fix tests when out/soong doesn't already exist by adding os.MkdirAll
to WriteFileToOutputDir.

Test: soong tests
Change-Id: I2a2b10e43b967d0c61d0dbe6a3f8bf381babe73c
 2021-11-09 17:25:57 -08:00
Colin Cross
836e387323 Use pathtools.WriteFileIfChanged in translateAndroidMk 
pathtools.WriteFileIfChanged was reimplemented in translateAndroidMk,
but without a call to os.MkDirsAll.  Reuse pathtools.WriteFileIfChanged.

Test: soong tests
Change-Id: If3f6a7bfc172b4a1a8945109801146c2b7e72b96
 2021-11-09 17:25:57 -08:00
Alexander Smundak
63861ddea8 Merge changes Ia41a5a2e,Ib29654e7 am: 45f97c6a1e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883569

Change-Id: Ia4bc0dcd0edf6420a18385e2fc5c23649edfbb23
 2021-11-10 01:25:48 +00:00
Jooyung Han
75a0719cbf Merge "Pass --min_sdk_version to aidl compiler" am: a5b538394c am: 29b2f3e48a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883408

Change-Id: I5970216bc2f69c6fac8e6e430f6109958eaed549
 2021-11-10 01:13:26 +00:00
Alexander Smundak
45f97c6a1e Merge changes Ia41a5a2e,Ib29654e7 
* changes:
  Allow non-constant from/to arguments in subst and patsubst
  Handle ifdef for local variables.
 2021-11-10 01:07:17 +00:00
Jooyung Han
29b2f3e48a Merge "Pass --min_sdk_version to aidl compiler" am: a5b538394c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883408

Change-Id: I6866db86875c19491c625e11764256003aaf6fca
 2021-11-10 00:52:12 +00:00
Jooyung Han
a5b538394c Merge "Pass --min_sdk_version to aidl compiler" 2021-11-10 00:31:54 +00:00
Jose "Pepe" Galmes
2aa23d5a40 Merge "Support for rust recovery snapshot." am: cd3af1e52c am: 32bfcdb916 am: b9be67b911 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885929

Change-Id: I4cb300d2975045e6ccb6bd1c6306aa969defafc4
 2021-11-09 21:01:45 +00:00
Jose "Pepe" Galmes
b9be67b911 Merge "Support for rust recovery snapshot." am: cd3af1e52c am: 32bfcdb916 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885929

Change-Id: Ic1eb7569560aa60226f40d6cdaa21f40ed84b20c
 2021-11-09 20:36:09 +00:00
Jose "Pepe" Galmes
32bfcdb916 Merge "Support for rust recovery snapshot." am: cd3af1e52c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885929

Change-Id: I45755bb556ff318ad2f4bf7442dfcbb45c8f0921
 2021-11-09 20:16:25 +00:00
Jose "Pepe" Galmes
cd3af1e52c Merge "Support for rust recovery snapshot." 2021-11-09 19:39:32 +00:00