Commit Graph

20372 Commits

Author SHA1 Message Date
Automerger Merge Worker
f39cf110ac Merge "Add support for multiple os types" am: a81668628e am: 6838e6a235
Change-Id: I571c74a26803389dd8308dfd7505caae456c2357
2020-03-09 20:56:29 +00:00
Automerger Merge Worker
6838e6a235 Merge "Add support for multiple os types" am: a81668628e
Change-Id: I7501a0c2685348aa4e196bdb2dcaac054b1a6972
2020-03-09 20:34:55 +00:00
Paul Duffin
a81668628e Merge "Add support for multiple os types" 2020-03-09 20:23:15 +00:00
Automerger Merge Worker
bd7e5ff396 Merge "Set '--force-determinism' option for boot image compilation." am: a8e37b98bb am: 854184da06
Change-Id: I717464b38b4b8f529649181d40eeabb29e059116
2020-03-09 20:17:53 +00:00
Automerger Merge Worker
854184da06 Merge "Set '--force-determinism' option for boot image compilation." am: a8e37b98bb
Change-Id: I262fbf661c61f2a1e6fe976558019bd1f402d906
2020-03-09 20:02:11 +00:00
Automerger Merge Worker
9bd6603154 Merge "Copy sdk_version to cc library snapshots" am: 71754bf640 am: 08e00e8ff4
Change-Id: Ic5b0e2a8da2f86c44c8314f46e813ee3ebc6068b
2020-03-09 19:57:09 +00:00
Ulyana Trafimovich
a8e37b98bb Merge "Set '--force-determinism' option for boot image compilation." 2020-03-09 17:00:13 +00:00
Paul Duffin
a04c107bfa Add support for multiple os types
Updates the member snapshot creation code to support multiple os types.
It basically sorts the variants by os type, then applies the code to
optimize the arch properties and then it optimizes the properties that
are common across architectures and extracts any properties that are
common across os types.

The java and cc member types needed to be modified to make the location
of the generated files within the snapshot os type dependent when there
is more than one os type. That was done by adding an OsPrefix() method
to the SdkMemberPropertiesBase which returns the os prefix to use when
there is > 1 os type and otherwise returns an empty string.

Added three tests, one for cc shared libraries, one for cc binary and
one for java header libraries.

Bug: 150451422
Test: m nothing
Change-Id: I08f5fbdd7852b06c9a9a2f1cfdc364338a3d5bac
2020-03-09 15:54:31 +00:00
Automerger Merge Worker
08e00e8ff4 Merge "Copy sdk_version to cc library snapshots" am: 71754bf640
Change-Id: Iede3dd99e34136a151fcb848303df115fa975f8f
2020-03-09 14:33:03 +00:00
Ulya Trafimovich
c0c98d51d6 Set '--force-determinism' option for boot image compilation.
Test: aosp_walleye-userdebug boots.
Change-Id: I0edf7fbfe18ea2f3d1cfda5138a48bdc1420aa6a

Bug: 150934453
2020-03-09 14:19:17 +00:00
Paul Duffin
71754bf640 Merge "Copy sdk_version to cc library snapshots" 2020-03-09 14:15:54 +00:00
Automerger Merge Worker
bc8e13ad53 Merge "Refactor java_library/java_test snapshot processing" am: a377311b90 am: 598c3aa836
Change-Id: I07f7e398c4ead1d41275ab409fb983f4235e9cdb
2020-03-09 13:48:17 +00:00
Automerger Merge Worker
598c3aa836 Merge "Refactor java_library/java_test snapshot processing" am: a377311b90
Change-Id: If1e91dcae2e64149aa40139b07768976cfa153a1
2020-03-09 13:34:43 +00:00
Treehugger Robot
a377311b90 Merge "Refactor java_library/java_test snapshot processing" 2020-03-09 13:14:32 +00:00
Automerger Merge Worker
4d2ec7e537 Merge "Refactor snapshot module creation" am: b3c763711a am: da1f602416
Change-Id: I6c5f06641a979102ecc52631643615424178b981
2020-03-09 11:23:30 +00:00
Automerger Merge Worker
1a155edf58 [automerger skipped] Merge "Apex_available check failure reveals dependency" am: 06b362fad7 am: f19e53af01 -s ours
am skip reason: Change-Id Id1a3fda67fe56fdc2dc90ec800d10689415de4d6 with SHA-1 7bd9444b0f is in history

Change-Id: Ifd6039ae9e75386db688f58437c3f1568c3f7c90
2020-03-09 11:23:24 +00:00
Automerger Merge Worker
da1f602416 Merge "Refactor snapshot module creation" am: b3c763711a
Change-Id: I3c7dc8b040123ddd1e33205f9198e9dd2e08e03c
2020-03-09 11:12:22 +00:00
Automerger Merge Worker
f19e53af01 Merge "Apex_available check failure reveals dependency" am: 06b362fad7
Change-Id: Id1b9a86e2f0ffbed4e1e87bff1aaa3bb43a92e87
2020-03-09 11:12:14 +00:00
Paul Duffin
0c394f3919 Copy sdk_version to cc library snapshots
Bug: 142935992
Test: m nothing
Change-Id: Ib77c548b1971c841749c87115108af8b092bb809
2020-03-09 11:10:04 +00:00
Paul Duffin
b3c763711a Merge "Refactor snapshot module creation" 2020-03-09 11:02:29 +00:00
Treehugger Robot
06b362fad7 Merge "Apex_available check failure reveals dependency" 2020-03-09 10:59:36 +00:00
Jiyong Park
65cc4f7777 Apex_available check failure reveals dependency
When the check for apex_available has failed, the build system now shows
the module that brought the unavailable module into the APEX.

Bug: 151051671
Test: m
Merged-In: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
(cherry picked from commit 7bd9444b0f)
Change-Id: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
2020-03-09 18:56:54 +09:00
Automerger Merge Worker
62cdc4ad57 Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5c5
Change-Id: I683d10496836a77d5140031daae27ac71a83c76f
2020-03-09 09:01:38 +00:00
TreeHugger Robot
5a3899b5c5 Merge "Apex_available check failure reveals dependency" into rvc-dev 2020-03-09 08:45:49 +00:00
Automerger Merge Worker
59756d77a2 Merge "Add a build script to compile modules and SDKs in AOSP." am: 714538fb5d am: bee569c43a
Change-Id: Ibb1c5f96f201d39ae633bb0e1de74846eb4f1b23
2020-03-09 08:33:29 +00:00
Automerger Merge Worker
bee569c43a Merge "Add a build script to compile modules and SDKs in AOSP." am: 714538fb5d
Change-Id: If74f51d5703d536079d9e993d76cee886c0827b7
2020-03-09 08:24:23 +00:00
Nicolas Geoffray
714538fb5d Merge "Add a build script to compile modules and SDKs in AOSP." 2020-03-09 08:09:15 +00:00
Jiyong Park
7bd9444b0f Apex_available check failure reveals dependency
When the check for apex_available has failed, the build system now shows
the module that brought the unavailable module into the APEX.

Bug: 151051671
Test: m
Change-Id: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
2020-03-09 14:29:18 +09:00
Automerger Merge Worker
97920d9838 [automerger skipped] Stop using the host python3 am: 828e1575e1 -s ours
am skip reason: Change-Id Ic0fb09c8970f3a1c9f3b7b0303168520dcbfc3d8 with SHA-1 669f769470 is in history

Change-Id: If19dbc9f555f1f9e5a1d775b973dbe4af05904b9
2020-03-07 22:00:34 +00:00
Automerger Merge Worker
9a2d6f4d18 Merge "Do not explicitly link ucrt, ucrtbase" am: c6453295a2 am: f035f6f5f6
Change-Id: I3448637762f9fe25779c02830a53509f03ab87a5
2020-03-07 21:49:31 +00:00
Automerger Merge Worker
f035f6f5f6 Merge "Do not explicitly link ucrt, ucrtbase" am: c6453295a2
Change-Id: Ia5f3fc6d1032cb1ea664fe6d994d2e66ef1ab823
2020-03-07 21:40:09 +00:00
Treehugger Robot
c6453295a2 Merge "Do not explicitly link ucrt, ucrtbase" 2020-03-07 21:22:23 +00:00
Dan Willemsen
828e1575e1 Stop using the host python3
We've now got a prebuilt in prebuilts/build-tools

Bug: 123089883
Test: treehugger
Change-Id: Ic0fb09c8970f3a1c9f3b7b0303168520dcbfc3d8
Merged-In: Ic0fb09c8970f3a1c9f3b7b0303168520dcbfc3d8
(cherry picked from commit 669f769470)
2020-03-07 11:22:30 -08:00
Automerger Merge Worker
4b6c8cdc89 Merge "Add version suffix for stub modules' Android.mk" am: 7423398025 am: a01b1cf891
Change-Id: I188139825a63f465f14df6b3ba83e7cd4276ed02
2020-03-07 09:11:18 +00:00
Automerger Merge Worker
a01b1cf891 Merge "Add version suffix for stub modules' Android.mk" am: 7423398025
Change-Id: I2d800d9f86b7d3f76ffad4f2ead4b8a4d48565f0
2020-03-07 08:59:17 +00:00
Treehugger Robot
7423398025 Merge "Add version suffix for stub modules' Android.mk" 2020-03-07 08:44:32 +00:00
Automerger Merge Worker
b7a4defbce Merge "Stop using the host python3" am: 5bf449c597 am: eb3ba50ea6
Change-Id: I6e948c8b2e620f17ad69ba8e2c57e8d9132d5e7f
2020-03-07 05:36:16 +00:00
Automerger Merge Worker
eb3ba50ea6 Merge "Stop using the host python3" am: 5bf449c597
Change-Id: I698b6e8dd94bc71d0fa055041217a2ab1861fb59
2020-03-07 05:20:03 +00:00
Treehugger Robot
5bf449c597 Merge "Stop using the host python3" 2020-03-07 05:02:46 +00:00
Pirama Arumuga Nainar
b8eefa8956 Do not explicitly link ucrt, ucrtbase
This was required before MinGW's default crt was set to ucrt.  In the
new setting, libmsvcrt.a is similar to libucrt.a and is implicitly
linked-in by the Clang driver.  Not explicitly linking in ucrt avoids
the link-order issue discussed in
https://github.com/android/ndk/issues/1198.

Test: m native-host-cross, go/android-llvm-windows-testing.
Change-Id: Idc125e550cae2f0eb812ca310d1d4be898a29ab4
2020-03-06 15:07:19 -08:00
Automerger Merge Worker
344ce5f777 apex: choose stub according to min_sdk_version am: 03b5185b88 am: 5cf1805a44
Change-Id: Ibe1984b4deaa0681a7339f871d8d3dc62072fe58
2020-03-06 20:13:50 +00:00
Automerger Merge Worker
5cf1805a44 apex: choose stub according to min_sdk_version am: 03b5185b88
Change-Id: I6a04b04589955d92a2d446706b155471dc44e20a
2020-03-06 20:04:21 +00:00
Dan Willemsen
669f769470 Stop using the host python3
We've now got a prebuilt in prebuilts/build-tools

Test: treehugger
Change-Id: Ic0fb09c8970f3a1c9f3b7b0303168520dcbfc3d8
2020-03-06 10:28:04 -08:00
Jooyung Han
ad4c18765e Add version suffix for stub modules' Android.mk
Becase there can be more than one stub libraries, LOCAL_MODULE should be
suffixed with SubName just like NDK stub.

Note that suffix should not be appended to the latest version if the
library is provided by APEX, Otherwise, those libs always need to be
referenced with suffix in .mk files.

Bug: 145796956
Test: m
Change-Id: If503fa651a63b0b215742553b250ecf5e0a30971
2020-03-07 03:12:45 +09:00
Jooyung Han
03b5185b88 apex: choose stub according to min_sdk_version
Native modules within APEX should be linked with proper stub version
according to its min_sdk_version.

For example, when min_sdk_version is set to "29", libfoo in the apex
would be linked to libbar of version 29 from platform, even if it has
a newer version like 30.

Bug: 145796956
Test: m nothing (soong tests)
Change-Id: I4a0b2002587bc24b7deeb5d59b6eeba5e1db5b1f
2020-03-07 03:12:45 +09:00
Automerger Merge Worker
0bc3ed6ff2 [automerger skipped] Merge "Convert cc to AndroidMkEntries" into rvc-dev am: 765ccd021f -s ours
am skip reason: Change-Id Ia3006b6747813693cf7e2b536030b21f3109f538 with SHA-1 d80cbca76d is in history

Change-Id: I342ee1bf2f471d758ee2ccc814bbd620ea8224ba
2020-03-06 17:30:42 +00:00
TreeHugger Robot
765ccd021f Merge "Convert cc to AndroidMkEntries" into rvc-dev 2020-03-06 17:13:29 +00:00
Nicolas Geoffray
90bc3cd304 Add a build script to compile modules and SDKs in AOSP.
Test: build-mainline-modules.sh
Bug: 142935992
Change-Id: I80a9bf8ce03d77705ba677f95b03aeb2ac2451d5
2020-03-06 14:35:48 +00:00
Automerger Merge Worker
51a5884b33 Enable androidmk processing in sdk testing am: 8c3fec4c37 am: 6c8b801d5f
Change-Id: Iaeb0e00ab33f66991f15011756360ab95668aea5
2020-03-06 13:49:03 +00:00
Automerger Merge Worker
6c8b801d5f Enable androidmk processing in sdk testing am: 8c3fec4c37
Change-Id: Ia9c64cf005906c73e095991a2d114fe75c29e835
2020-03-06 13:34:36 +00:00