Commit Graph

28892 Commits

Author SHA1 Message Date
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
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
Treehugger Robot
44e2559f0f Merge "Add more comments to arch.go" 2020-11-19 22:45:15 +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
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
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
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
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
Jaewoong Jung
157a781ce4 Merge "Add and update comments in env and android_env.go" 2020-11-19 02:19:25 +00:00
Jaewoong Jung
767a3504c4 Merge "Improve soong_ui main.go comments." 2020-11-19 02:19:05 +00:00
Janis Danisevskis
b780e01b66 Merge "Fix Broken build 6978250 on aosp-master" am: caa0d93da0 am: 9660b33251
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1504113

Change-Id: I0ccaa10d461c193add5713dbb518208ceec9b3ee
2020-11-19 01:14:58 +00:00
Janis Danisevskis
9660b33251 Merge "Fix Broken build 6978250 on aosp-master" am: caa0d93da0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1504113

Change-Id: I879e381ab7f4348e70e364c2cdee4e434014a15a
2020-11-19 00:52:01 +00:00
Colin Cross
95c971d326 Merge changes Ic2daab29,I884ddd09 am: 1357c11948 am: 19cab752a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501153

Change-Id: I31329da90efe511bb5975360a76a14b9fdb9e9a5
2020-11-19 00:47:21 +00:00
Janis Danisevskis
caa0d93da0 Merge "Fix Broken build 6978250 on aosp-master" 2020-11-19 00:21:29 +00:00
Jiyong Park
dda8f69e43 Introduce PackagingBase
PackagingBase is the base struct that implements the basic packaging
functionalities. Here, packaging means grouping dependencies into an
output file where the built artifacts from the dependencies are placed
in a directory-like structure in the output file. The exact format of
the output file is irrelevant; it could be a filesystem image, tar.gz,
zip, or whatever.

PackagingBase is responsible for traversing the dependencies and copying
their outputs under the package root directory, which is expected to be
provided by the module type that includes PackagingBase. Then the
concrete module type is expected to do final step of converting the
package root directory into the output file of specific format.

Bug: 159685774
Bug: 172414391
Test: m dist out/dist/cvd-host_package.tar.gz
Change-Id: I5446eee4834ce3b6f0f5843d93bb330a26d42fe3
2020-11-19 08:58:06 +09:00
Jiyong Park
6f0f688c4b add android_filesystem
android_filesystem is a module type that can be used to create filesystem
images out of binaries built for Android. Its initial use will be for
creating an Android-like OS image to run on virtual machines, but the
use is not limited to it.

The module type currently lacks a lot of features like the support for
other filesystem types, and the ability to do something like signing the
image using avbtool, etc. Those will be added in follow-up CLs as we
have actual demands.

Bug: 172414391
Test: m
Change-Id: I4b779d4586e04d9a960688e73b711166708558ab
2020-11-19 08:58:06 +09:00
Jiyong Park
dc48afd3c5 zipsync handles symlink
This change fixes a bug that zipsync didn't handle symlink correctly;
symlink was extracted as a regular file whose content is the target
path. Fixing the problem by correctly creating the symlink using
os.Symlink.

Bug: N/A
Test: manual

Change-Id: Ib6685c14e1950d1057d89672883cdd9e4879069a
2020-11-19 08:58:02 +09:00
Colin Cross
19cab752a8 Merge changes Ic2daab29,I884ddd09 am: 1357c11948
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501153

Change-Id: I0f3abfa89d877306cf6085eb03cef73bf1a966aa
2020-11-18 23:56:27 +00:00
Colin Cross
1357c11948 Merge changes Ic2daab29,I884ddd09
* changes:
  Skip creating variants for disabled OSes
  Use bitfield for HostOrDeviceSupported
2020-11-18 23:36:24 +00:00
Treehugger Robot
a088bff723 Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36 am: b08a091502 am: 3f57de54b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480605

Change-Id: I85004a1e2d0c6ba083b298ea18c2d765da43fc27
2020-11-18 22:51:57 +00:00
Janis Danisevskis
6439a8dae2 Fix Broken build 6978250 on aosp-master
Bug: 173570265
Change-Id: I3425dedf4ed8435420cca9b5917033262ba8b3cc
2020-11-18 14:26:41 -08:00
Treehugger Robot
3f57de54b2 Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36 am: b08a091502
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480605

Change-Id: I35120d93123cdcda523c5bfe076f93254a0227c2
2020-11-18 21:54:10 +00:00
Treehugger Robot
b08a091502 Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36
* changes:
  Store ndkKnownLibs in the config
  Register the kythe singleton on the Context instead of globally
  Store ninja file deps from PackageVarContext in the config
  Store SingletonMakeVarsProviders in the config
2020-11-18 20:00:31 +00:00
Treehugger Robot
94f19bccec Merge "Parse else ifxxx statement" am: 725af86fe7 am: 4a062c1847
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501162

Change-Id: I133293682e186203d7c5a379cf91a8466188eab2
2020-11-18 19:34:16 +00:00