StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,211 Commits 1 Branch 0 Tags
6c2b0d1c65c69ce600dad7091c58d99e9820f581
Commit Graph

32211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Desprez
6c2b0d1c65 Merge "Use java host unit tests template for unit tests" am: 62aa21508c am: 706ee179ae am: efff25ce93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505512

Change-Id: I11c25d0e93715e7c226f0f98ea4916b8c3a4e9e0
 2020-11-20 02:31:43 +00:00
Treehugger Robot
53cb19be2d Merge "Add more comments to arch.go" am: 44e2559f0f am: 23d5b6de26 am: 07cd7da340 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500978

Change-Id: I4df2ac67e441b2cf267628ec01e29aea3622b0f8
 2020-11-20 02:31:11 +00:00
Sasha Smundak
d92016409f Fix comments with continuation am: 7890211d58 am: 9e447a7a27 am: b631e72e6f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505513

Change-Id: I8e76ee9a0260a045adf964c2192751db90870919
 2020-11-20 02:30:00 +00:00
Julien Desprez
efff25ce93 Merge "Use java host unit tests template for unit tests" am: 62aa21508c am: 706ee179ae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505512

Change-Id: I590d8ad42445c39ad69fdf97efcbedd5750875aa
 2020-11-20 02:07:44 +00:00
Treehugger Robot
07cd7da340 Merge "Add more comments to arch.go" am: 44e2559f0f am: 23d5b6de26 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500978

Change-Id: I8c4c62294a87ea3c35aac1026f4c2dea48835631
 2020-11-20 02:07:29 +00:00
Sasha Smundak
b631e72e6f Fix comments with continuation am: 7890211d58 am: 9e447a7a27 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505513

Change-Id: I752823f4b20c21674e58d30f5b3c8a0504e1838d
 2020-11-20 02:05:35 +00:00
Julien Desprez
706ee179ae Merge "Use java host unit tests template for unit tests" am: 62aa21508c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505512

Change-Id: Ieff5faa54a6908051987cda7ad46a3d0e050f97a
 2020-11-20 01:20:28 +00:00
Treehugger Robot
23d5b6de26 Merge "Add more comments to arch.go" am: 44e2559f0f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500978

Change-Id: I056ef563320bc6e8851edecf99dd30a8e7972b0e
 2020-11-20 01:18:40 +00:00
Sasha Smundak
9e447a7a27 Fix comments with continuation am: 7890211d58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1505513

Change-Id: Ic8af398cdfe92ea78471f59ca79b400dfc389f98
 2020-11-20 01:16:41 +00:00
Julien Desprez
62aa21508c Merge "Use java host unit tests template for unit tests" 2020-11-20 00:07:41 +00:00
Treehugger Robot
44e2559f0f Merge "Add more comments to arch.go" 2020-11-19 22:45:15 +00:00
Paul Duffin
69cc037aa3 Merge changes from topic "fix-stubs-source-snapshot" am: b479459ac9 am: 5248161eaf am: e3ec3ea345 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1503793

Change-Id: I216e88acd98f974558e76ec29ac9f521f89436b2
 2020-11-19 20:03:52 +00:00
Treehugger Robot
b5912057ec Merge "java link time error improve" am: e63ab5ea02 am: a5fc86f799 am: 4b4b9c5498 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501002

Change-Id: I8682fd432236b04b40e80f56dfda66cbcf57dd0d
 2020-11-19 20:03:02 +00:00
Sasha Smundak
7890211d58 Fix comments with continuation 
Backgound: aog/919954 tried to handle
```
   second line
```

but did it incorrectly. The parser works correctly (so this change
reverts aog/919954), it returns multiline comment, but the serializer
converting the internal representation to Blueprint was not emitting
'//' on the lines after the first.

Test: treehugger
Bug: 127521510
Change-Id: I0257a8b3cc4ffcaa6bea44113ceba66bb99d7e43
 2020-11-19 11:52:20 -08:00
Paul Duffin
e3ec3ea345 Merge changes from topic "fix-stubs-source-snapshot" am: b479459ac9 am: 5248161eaf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1503793

Change-Id: Ib7a77ca962d7f2f543190c982c680532aa96c2e6
 2020-11-19 19:37:09 +00:00
Treehugger Robot
4b4b9c5498 Merge "java link time error improve" am: e63ab5ea02 am: a5fc86f799 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501002

Change-Id: I6bc2c57f8e8239f045cb9b0749fd46ee1a0864f6
 2020-11-19 19:36:58 +00:00
Colin Cross
a684540945 Add more comments to arch.go 
Make sure every exported function or type has a godoc comment.

Also makes minor changes like unexporting functions that are not used
outside the package and fixing minor style warnings.

Bug: 173449605
Test: m checkbuild
Change-Id: I533a595d02035aae8b2b603590be639826d2d4c8
 2020-11-19 11:20:05 -08:00
Paul Duffin
5248161eaf Merge changes from topic "fix-stubs-source-snapshot" am: b479459ac9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1503793

Change-Id: I710d7a4c235b5912b46edf690f44c04babf841bb
 2020-11-19 19:16:35 +00:00
Treehugger Robot
a5fc86f799 Merge "java link time error improve" am: e63ab5ea02 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501002

Change-Id: I6b896382dfe8137a93e349a50f38001b4ac8a984
 2020-11-19 19:15:04 +00:00
Paul Duffin
b479459ac9 Merge changes from topic "fix-stubs-source-snapshot" 
* changes:
  Fix prebuilt_stubs_sources to work with no stubs sources
  Revert "Use glob for java_sdk_library_import stub_srcs"
 2020-11-19 18:39:02 +00:00
Treehugger Robot
e63ab5ea02 Merge "java link time error improve" 2020-11-19 18:38:16 +00:00
Julien Desprez
70898c4006 Use java host unit tests template for unit tests 
Test: make aoa-helper-tests
Bug: 172961860
Change-Id: I2eaee277961f29adfd22e7c65248c9403bd69b81
 2020-11-19 09:44:39 -08:00
Paul Duffin
1a39332cf6 Fix prebuilt_stubs_sources to work with no stubs sources 
The framework-sdkextension java_sdk_library module defines an API for
public, system and module_lib API surfaces but the public API is empty.
The empty public API results in an empty .srcjar being repackaged and
merged into the sdkextension-sdk snapshot and results in no directory
for the public API stubs sources being created. Unfortunately, the
Android.bp file in the snapshot is created by Soong and it does not
know that the public API will be empty and so it creates an Android.bp
file that references the directory into which the stubs sources should
be added but which ends up not existing in the snapshot. Referencing a
non-existent directory causes a build failure.

This change fixes that issue by using PathForModuleSrc with no path
components to get the path to the module directory (which must exist)
and then resolving the module relative local src directory against
that. The local src directory is globbed to find all the files, which
will return an empty set of paths if the directory does not exist.
Finally, the file paths are passed as an rsp file to soong_zip to avoid
exceeding any command line limits.

Many other different approaches were considered:
* Adding a property to the java_sdk_library to indicate that the public
  API was actually empty. That would require extra maintenance by
  developers and would require some extra checks to be performed after
  generating the stubs source to ensure that it was empty which would
  complicate the build process.
* Creating a directory with some placeholder file (empty directories
  don't work well with git) that would force the creation of the
  directory. That file would most likely be created whether the API
  was empty or not, would need to be stored in git alongside the source
  and could be quite confusing to reviewers.

Bug: 173508731
Test: m nothing - to run new tests
      Build sdkextension-sdk, unpack it and then build the .srcjar
      files for the public, system and module_lib API surfaces.
      Without this change the build failed, reporting that the
      stubs_sources directory for the public API did not exist.
      With this change the build succeeded.
      Checked the contents of the resulting .srcjar files and made
      sure that the public one was empty and the others contained
      the SdkExtensions.java class and a package-info.java file.
Change-Id: Ia468a3f37349f2dbc21db67744bda6461498d515
 2020-11-19 12:42:18 +00:00
Paul Duffin
ab5ac8f169 Revert "Use glob for java_sdk_library_import stub_srcs" 
This reverts commit 7f97957ded.

Reason for revert: breaks sdk snapshots b/173508731
Bug: 173508731
Test: Ran prebuilts/runtime/update.py and then m nothing
      Before revert it failed
      After revert it worked

Change-Id: I9c081681fac589e37788a0d592435e3224011c58
 2020-11-19 12:03:51 +00:00
Treehugger Robot
bd09da2f50 Merge changes from topic "package" am: 7a64f7e5b6 am: 1b22324529 am: 3105213fe1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496007

Change-Id: I81613a66378c52681073460bf88e28269598b881
 2020-11-19 09:04:06 +00:00
Jiyong Park
dfb0d04d48 Introduce PackagingBase am: dda8f69e43 am: 217802c8d3 am: 9fcd3b23fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492003

Change-Id: I091195594de7ab8ff67b83852df5e65d24161145
 2020-11-19 09:04:04 +00:00
Treehugger Robot
af88edc4bf Merge "zipsync handles symlink" am: 83f738cae2 am: b3b509b3a5 am: d7942fe948 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502377

Change-Id: I4dc6fd17de92912713b57556534d3aa70dadca0d
 2020-11-19 09:03:37 +00:00
Treehugger Robot
3105213fe1 Merge changes from topic "package" am: 7a64f7e5b6 am: 1b22324529 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496007

Change-Id: I1e989ca85e11ed366d17bd0edaea2527e3d5871e
 2020-11-19 08:23:02 +00:00
Jiyong Park
9fcd3b23fd Introduce PackagingBase am: dda8f69e43 am: 217802c8d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492003

Change-Id: Iacd21b4659167a840b279e4a45681db4a646e7fd
 2020-11-19 08:23:01 +00:00
Treehugger Robot
d7942fe948 Merge "zipsync handles symlink" am: 83f738cae2 am: b3b509b3a5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502377

Change-Id: I484728ba9992575d1918f32b3b63c743ed6eb4f8
 2020-11-19 08:22:50 +00:00
Treehugger Robot
1b22324529 Merge changes from topic "package" am: 7a64f7e5b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496007

Change-Id: I87bb5a2dd72a0abe0c4d6114764cee22ff813a00
 2020-11-19 08:04:05 +00:00
Jiyong Park
217802c8d3 Introduce PackagingBase am: dda8f69e43 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492003

Change-Id: I7d5bfe90fd2661d20097ac72badf3f13b11420c0
 2020-11-19 08:04:00 +00:00
Treehugger Robot
b3b509b3a5 Merge "zipsync handles symlink" am: 83f738cae2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502377

Change-Id: Ie023fe0b547fc1cbdd424815d288ff0f67fd8b17
 2020-11-19 08:03:20 +00:00
Treehugger Robot
7a64f7e5b6 Merge changes from topic "package" 
* changes:
  add android_filesystem
  Introduce PackagingBase
 2020-11-19 07:49:00 +00:00
Treehugger Robot
83f738cae2 Merge "zipsync handles symlink" 2020-11-19 07:41:30 +00:00
Yo Chiang
efcf77dc25 Merge "prebuilt_etc: Improve comments and slight refactoring" am: 9d445fabfd am: 37125a7ff5 am: b8946c9e2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1499750

Change-Id: I27753ca3dee6eeeeec47d830d4a31cb3005e89df
 2020-11-19 07:01:45 +00:00
Yo Chiang
b8946c9e2c Merge "prebuilt_etc: Improve comments and slight refactoring" am: 9d445fabfd am: 37125a7ff5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1499750

Change-Id: I7817a0381794bf0f7b0b588ddc3686641d713ffd
 2020-11-19 06:47:39 +00:00
Yo Chiang
37125a7ff5 Merge "prebuilt_etc: Improve comments and slight refactoring" am: 9d445fabfd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1499750

Change-Id: I798b07afb65f62c8a670cf7987fde4528f51bd68
 2020-11-19 06:19:45 +00:00
Yo Chiang
9d445fabfd Merge "prebuilt_etc: Improve comments and slight refactoring" 2020-11-19 05:44:46 +00:00
Colin Cross
45200e7059 Merge "Revert "Skip creating variants for disabled OSes"" am: 5f8293417c am: 11f9930754 am: aac88a00ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1504106

Change-Id: I33f04dbffa31a23101169c988ee7e00822efdbf7
 2020-11-19 03:50:23 +00:00
Jaewoong Jung
1b5990740d Merge "Add and update comments in env and android_env.go" am: 157a781ce4 am: d422e7734f am: aa180a90e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500981

Change-Id: I3f80a1713a12366820e9d514ad18f9257581e60c
 2020-11-19 03:50:18 +00:00
Jaewoong Jung
9f23792615 Merge "Improve soong_ui main.go comments." am: 767a3504c4 am: 757c33b9de am: 5320b5c43c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502264

Change-Id: Iad2ddd67f04abac14e6c18a936bb326fdf4b91eb
 2020-11-19 03:50:01 +00:00
Colin Cross
aac88a00ec Merge "Revert "Skip creating variants for disabled OSes"" am: 5f8293417c am: 11f9930754 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1504106

Change-Id: I472cae9b06091ea45fd6c676a847dc5452e513f2
 2020-11-19 03:25:47 +00:00
Jaewoong Jung
aa180a90e0 Merge "Add and update comments in env and android_env.go" am: 157a781ce4 am: d422e7734f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500981

Change-Id: I4d0b5a095ba5870f8da3f3ceb557ed2814309f5d
 2020-11-19 03:25:42 +00:00
Jaewoong Jung
5320b5c43c Merge "Improve soong_ui main.go comments." am: 767a3504c4 am: 757c33b9de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502264

Change-Id: Ibaeab8e869d4b891c409f4afbaefc32590605d19
 2020-11-19 03:25:32 +00:00
Colin Cross
11f9930754 Merge "Revert "Skip creating variants for disabled OSes"" am: 5f8293417c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1504106

Change-Id: I797b9c43bbb8f5cd6adcec8df47e1dc2ef0fcb68
 2020-11-19 02:38:22 +00:00
Jaewoong Jung
d422e7734f Merge "Add and update comments in env and android_env.go" am: 157a781ce4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500981

Change-Id: I2f660571dccea64b3474280df390ea59ec6261e0
 2020-11-19 02:38:13 +00:00
Jaewoong Jung
757c33b9de Merge "Improve soong_ui main.go comments." am: 767a3504c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502264

Change-Id: I7d51080c8682a7a704295322a2aaf6759814d560
 2020-11-19 02:37:29 +00:00
Colin Cross
5f8293417c Merge "Revert "Skip creating variants for disabled OSes"" 2020-11-19 02:34:36 +00:00
Colin Cross
08d6f8fd75 Revert "Skip creating variants for disabled OSes" 
This reverts commit d976af0cb4.

Reason for revert: broke windows SDK build: missing bin/dexdump.exe

Bug: 173663545
Change-Id: Ibb541507650beabd2d94885dd8d66f724a358ca7
 2020-11-19 02:33:19 +00:00