Commit Graph

16968 Commits

Author SHA1 Message Date
Treehugger Robot e06c84e103 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:05 +00:00
Treehugger Robot dc9369ef7f Merge "Generate tradefed config for rust device tests." 2019-12-03 21:19:12 +00:00
Ulya Trafimovich 4d2eeed0da Use boot image extension for framework libraries.
This patch splits the system boot image in two parts:

  - The ART boot image. This is the primary boot image that is
    included in the ART apex and contains dexpreopted Core Libraries.

  - The framweork boot image extension. It depends on the ART boot
    image and contains framework libraries.

The third "apex" boot image (used in the JIT-zygote experiment)
remains unchanged; it is a monolithic primary boot image that
contains both libcore and framework libraries.

Dexpreopting of APKs now uses the framework boot image extension
(which in turn pulls in the ART boot image as a dependency).

Test: m
Test: phone boots:
    lunch aosp_walleye-userdebug && m \
        && adb reboot bootloader && fastboot flashall -w

Bug: b/119800099

Exempt-From-Owner-Approval: rebased after getting approval.

Change-Id: Ida40dfae8c83bf7c2e737d5c7ea418e1197ad826
2019-12-03 13:59:25 +00:00
Paul Duffin 3ae3b17083 Merge "Add support for host sdk" 2019-12-03 10:08:05 +00:00
Paul Duffin e63106a08c Merge "Add model to represent generated snapshot .bp file" 2019-12-03 10:07:10 +00:00
Xin Li 1a898a1384 Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: Id15b02a54a94d8ab201d9971ae38c2b73f52487d
2019-12-02 21:25:01 -08:00
Treehugger Robot f6739a65dd Merge "Link type will be check in android_library also" 2019-12-03 03:41:21 +00:00
Evgenii Stepanov 6d5f9a965d Merge "Add -instcombine-lower-dbg-declare to hwasan flags."
am: e643cd2b61

Change-Id: I341f9769410bc4f86135fa8e2f12ecba4e01f15d
2019-12-02 18:22:38 -08:00
Treehugger Robot e643cd2b61 Merge "Add -instcombine-lower-dbg-declare to hwasan flags." 2019-12-03 02:19:08 +00:00
Jiyong Park e9f6b5916b Merge "Refactor the routine for creating apexFile"
am: d7b4749cf0

Change-Id: Icb3386849156203cf0f1734ffd7ff672e240821f
2019-12-02 17:17:45 -08:00
Treehugger Robot d7b4749cf0 Merge "Refactor the routine for creating apexFile" 2019-12-03 01:08:38 +00:00
Roshan Pius 5c376a0c91 Merge "soong: Align update boot jar variable with system_server jar"
am: d6fb4842c9

Change-Id: If93859af6ca6a7b464de66b9278741ecc1bd279e
2019-12-02 16:47:50 -08:00
Roshan Pius d6fb4842c9 Merge "soong: Align update boot jar variable with system_server jar" 2019-12-03 00:43:17 +00:00
Chih-Hung Hsieh ede57ae812 Generate tradefed config for rust device tests.
* The RustBinaryTest runner and device test config template
  are derived from GTest. Device tests are pushed to /data/local/tmp.

Bug: 140938178
Test: make unicode-xid projects; run atest
Change-Id: Idb4cab7872b48c6e25bc59b85aa6d9dece4383ec
2019-12-02 17:44:53 +00:00
Roshan Pius ccc26ef316 soong: Align update boot jar variable with system_server jar
Use apex:jar pair values for updatable boot jars to align with
updatable system_server values.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1d6dfe3325d9091b7c724458be4e6471f9086666
2019-12-02 08:37:57 -08:00
Paul Duffin e44358fa8f Add support for host sdk
Adds HostSupported() method to ModuleBase for use by sdk. Adds
host_supported/device_supported to all prebuilt modules and the
sdk snapshot (where necessary).

Adds TestHostSnapshot to verify the behavior is correct.

Bug: 143678475
Test: m nothing
Change-Id: I8b4d097e46d5804f62cb8f651a83069299a3e639
2019-12-02 12:59:38 +00:00
Paul Duffin b645ec8e34 Add model to represent generated snapshot .bp file
Having each module type generate the contents of the snapshot's .bp
file results in lots of duplicated code. This adds an intermediate
model for use by the module types and then generates the .bp file
contents from that.

This not only removes the duplicated formatting code but it also
allows consistent handling of shared properties such as name further
reducing duplication. It also makes it possible to duplicate the
versioned and unversioned prebuilt modules from the same model.

Extracts generatedContents from generatedFile to allow the contents
to be populated without creating an output file, for testing.

Cleans up unused code.

Bug: 143678475
Test: m nothing
Change-Id: If21b84db0ef3fdfb5dc11ea0973ce6cb73603ea3
2019-12-02 12:59:38 +00:00
Jiyong Park 3814f4df2b apex_available is defaultable
Previously, it was defaultable only for cc_library. Now, it is
defaultable for all module types.

Bug: 128708192
Test: m
Change-Id: If248f593da6f4b724bf889ccd7f2e077d48069b5
2019-12-02 13:48:33 +09:00
Paul Duffin 5aa2f2df2a Remove unused methods from sdk/sdk_test.go
am: 01178ed7d1

Change-Id: I5cbe4682953c7426250cfacd8d67f88cbe121aa3
2019-12-01 02:04:01 -08:00
Jiyong Park f653b05d55 Refactor the routine for creating apexFile
This change is to make it easier to add new fields to the struct.
transitiveDep field is added to distinguish apexFiles coming from
transitive dependencies of the APEX. We will later use the info to
reduce the size of bundled APEXes by replacing the transitive deps with
symlinks to the corresponding files in the system partition outside of
the APEX.

Bug: 144533348
Test: m

Change-Id: I283859f2f2f1b5cfb3025569f168ba8569b22bb9
2019-11-30 14:49:13 +09:00
Paul Duffin 01178ed7d1 Remove unused methods from sdk/sdk_test.go
Bug: 143678475
Test: m conscrypt-module-sdk
Change-Id: Ic011fd63b226beb455793e2df08114992b858698
2019-11-29 20:35:06 +00:00
Paul Duffin 9a8ccde833 Simplify sdk_snapshot module member list generation
am: 66905ed6cf

Change-Id: I06f6f9143f3c4f04fb54e1ccd759d291d3f2ec8a
2019-11-29 01:42:15 -08:00
Paul Duffin 2140aa6ad2 Remove unused frozenVersions() method
am: 7264c69892

Change-Id: I5bb05e83c3b91943253d3b8379b99acb1950ba67
2019-11-29 00:17:57 -08:00
Paul Duffin 66905ed6cf Simplify sdk_snapshot module member list generation
When generating the list of members the names of the resolved
modules are used in the case of java_libs and stubs_source whereas
the name stored in the nativeLibInfo is used for native_shared_libs.

Those names are identical to the names provided in the corresponding
sdk property so this switches to use those instead as it is more
consistent and simplifies future refactorings.

Bug: 143678475
Test: m nothing
Change-Id: I9c08a8175fa9a37bb0cd89a361ef4c0f613b0dab
2019-11-28 21:02:12 +00:00
Paul Duffin 7264c69892 Remove unused frozenVersions() method
Bug: 143678475
Test: m nothing
Change-Id: Ia5d417cfccfcd90b02a95b5b806b211b97e340db
2019-11-28 21:02:12 +00:00
Paul Duffin 8afdd32b7f Merge "Dedup code for generating prebuilt_stubs_sources in snapshot"
am: bf857716a1

Change-Id: I2d563f359295a940e4b90688618cf3c1d34d812f
2019-11-27 08:26:54 -08:00
Treehugger Robot bf857716a1 Merge "Dedup code for generating prebuilt_stubs_sources in snapshot" 2019-11-27 16:21:41 +00:00
Martin Stjernholm 7b2659c0f5 Merge "Document the ":module{.tag}" syntax in a more visible place."
am: 1d2daa5168

Change-Id: Ib1aaca511b82bb9774b2b1d4bb198b2e69f2429f
2019-11-27 06:11:02 -08:00
Ulyana Trafimovich ee40866813 Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules.""
am: 565b52610f

Change-Id: I070b02f9f3c29912126cc07029f44e926cd84148
2019-11-27 06:08:38 -08:00
Martin Stjernholm 1d2daa5168 Merge "Document the ":module{.tag}" syntax in a more visible place." 2019-11-27 13:01:03 +00:00
Ulyana Trafimovich 565b52610f Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" 2019-11-27 12:45:34 +00:00
Ulyana Trafimovich f2cb7e959b Revert^2 "Do not dexpreopt system server jars from updatable modules."
This reverts commit 01f6b0a656.

Reason for revert: Build failure is not reproducible.
Forrest build on the same build ID 6033773 and same target
cf_x86_phone-userdebug_coverage finished successfully.

Change-Id: I5077f8332aa0b8037e324b89d41f35b86b8cf216
2019-11-27 12:29:50 +00:00
Søren Gjesse 8e505e3f01 Remove passing -forceprocessing flag to R8
R8 ignores the flag

Test: m -j
Change-Id: Ie394dfc24bb5632717d23e9ab4ad03b6cc1feb19
2019-11-27 12:40:07 +01:00
Kyeongkab.Nam d9bfc18600 Merge "Fix incorrect install path for priv-app prebuilt"
am: a75606be1e

Change-Id: I527272dcd327a6d7f6fbc458d9f123809841356a
2019-11-27 02:07:25 -08:00
Treehugger Robot a75606be1e Merge "Fix incorrect install path for priv-app prebuilt" 2019-11-27 09:20:15 +00:00
Jooyung Han 9909337ff8 Merge "Fix: install flattened apex on system_ext"
am: 6aa363b7ae

Change-Id: I0c406d4248f147c2e7184514732f4d605135b335
2019-11-26 23:37:57 -08:00
Jooyung Han 6aa363b7ae Merge "Fix: install flattened apex on system_ext" 2019-11-27 07:30:54 +00:00
Jooyung Han 91df2084ad Fix: install flattened apex on system_ext
This build rule is specific to platform APEXes.
For non-platform APEXes, MakeAsSystemExt() is not applied.

This fixes the cases of "soc_specific: true" apexes which fails to
build.

Bug: 139053989
Test: m nothing (soong tests)
Change-Id: I98d0257499647ab41cdaa62a3671d89addbdf833
Exempt-From-Owner-Approval: got +1 before rebasing
2019-11-27 07:30:37 +00:00
Paul Duffin 65b8669b7d Merge "Check the contents of an SDK snapshot's generated Android.bp"
am: 42775ba0bc

Change-Id: I19d9a73dd802bbfe18a28d701e3f6318e84991fd
2019-11-26 23:10:49 -08:00
Treehugger Robot 42775ba0bc Merge "Check the contents of an SDK snapshot's generated Android.bp" 2019-11-27 07:00:58 +00:00
Artur Satayev bedffa880d Merge "Add exported_plugins to java.Library."
am: 4a692427f7

Change-Id: I44591bbce6d18ff43bbf6ddac9cbcb528b865529
2019-11-26 17:00:45 -08:00
Treehugger Robot 4a692427f7 Merge "Add exported_plugins to java.Library." 2019-11-27 00:52:46 +00:00
Colin Cross ff27ce4cc0 Fix errorProtoLog error messages
Use Printf instead of Println for formatted strings, and pass
the filename instead of the proto.

Test: cuj_tests
Change-Id: Id261b5a34304a0caa61faa1f3bbc388aacdd25a6
2019-11-26 16:21:58 -08:00
Colin Cross 28f527c3da Write BUILD_DATETIME_FILE after SetupOutDir
Delay writing the BUILD_DATETIME_FILE until after the out directory
has been created.

Test: cuj_tests
Change-Id: Ice6f34d003f93c26b5d2d0b64f92b11efe16c2d4
2019-11-26 16:21:58 -08:00
Paul Duffin b1a8813520 Dedup code for generating prebuilt_stubs_sources in snapshot
Removes duplicated code for generating a versioned and non-versioned
form of the prebuilt_stubs_sources module in the snapshot.

Bug: 143678475
Test: m nothing

Change-Id: Ic431b6fcb6f3c7c85f1a04cb6f087424aaf0cffa
2019-11-26 22:30:27 +00:00
Paul Duffin ac37c503e0 Check the contents of an SDK snapshot's generated Android.bp
Test: m nothing
Bug: 143678475
Change-Id: I407d83c79d6b1ad8082e560726f0bfa7cacab3f0
2019-11-26 22:30:19 +00:00
Dan Shi 36c77ad20b Merge "Clean vts-core in host/out to ensure old package to be removed."
am: 0375dd9a37

Change-Id: Ie88574ba324aa5f63b9daeab6bd754b5194579ce
2019-11-26 13:30:40 -08:00
Treehugger Robot 0375dd9a37 Merge "Clean vts-core in host/out to ensure old package to be removed." 2019-11-26 21:18:28 +00:00
Artur Satayev 9cf4669bc4 Add exported_plugins to java.Library.
The behaviour is similar to go/be#java_library.exported_plugins. Plugins added to exported_plugins of library X are not applied to the library itself, but rather to libraries that directly depend on the library X.

Test: m checkbuild
Bug: 139740873
Change-Id: I4042bd482ad9cb12d6fbaac51f039d38b1b7a428
2019-11-26 19:05:26 +00:00
Nick Desaulniers 4f49e35902 soong: upgrade Android platform to clang-r370808
-Wc99-designators warns for the use of nested and array initializers in
C++20 code. Many internal projects have pushed back against this
warning.

Disables:
- -Wimplicit-int-float-conversion
- -Wpointer-compare
- -Wxor-used-as-pow
- -Wfinal-dtor-non-final-class
- -Wreorder-init-list

For projects under external/, vendor/, etc, but only if they use
Android.bp (not Android.mk) and -Wreorder-init-list may be re-enabled by
-Wall if set locally.

-Wno-incomplete-setjmp-declaration is needed for NDK stubs that get
generated (functions without full definitions of their parameters).

Sets
- -Wno-error=implicit-int-float-conversion
- -Wno-error=reorder-init-list
for all projects in order to unblock landing the compiler upgrade due to
internal projects not being able to disable or fix these before the
upgrade.

Bug: 139945549
Test: build (aosp_crosshatch, crosshatch, aosp_x86_64-eng,
  walleye), boot internal devices, bionic + RS atests, kernel builds.
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

Change-Id: I18e3c0eb657fd59824526f36c6dd57bdcf0526ba
2019-11-26 10:09:15 -08:00