Commit graph

17082 commits

Author SHA1 Message Date
Treehugger Robot
bed70f837b Merge "Test par file argument handling" 2019-12-05 16:23:56 +00:00
Treehugger Robot
dc0e8fd131 Merge changes Id261b5a3,Ice6f34d0
* changes:
  Fix errorProtoLog error messages
  Write BUILD_DATETIME_FILE after SetupOutDir
2019-12-05 09:10:13 +00:00
Treehugger Robot
5f9e5244c5 Merge "Remove passing -forceprocessing flag to R8" 2019-12-05 08:56:38 +00:00
Jiyong Park
b326ac2b65 Fix: vendor and odm are restricted to use public platform properties
There was a mistake in the condition.

Bug: N/A
Test: N/A

Change-Id: I07f79fdcc3c946a4b9e957e5a42b6694b5eeb251
2019-12-05 13:35:35 +09:00
Jiyong Park
317645e84c Overridden APEX doesn't contribute to the file contexts
This change fixes the problem that when an apex module is overridden by
another override_apex, the <apex_name>-file_contexts are duplicated when
creating the system-level file-contexts.

Fixing this by not emitting the file_context info for the overridden
apex.

In doing so, OverridableModule interface was extended to have
GetOverriddenBy() method which can be used to test whether a module is
an overridden one or not.

Bug: 144338929
Test: m (apex_test amended)
Test: add "override_apex {name:"com.googlge.android.tzdata",
Change-Id: I5e9401c32899bb9987c90cba4185f571dc1a87f0
base:"com.android.tzdata"}" and the build is successful
2019-12-05 13:25:39 +09:00
Colin Cross
31bf00dac3 Export art dexpreopt image zip file
Test: m  out/target/product/generic_arm64/boot.zip
Bug: 144491400
Change-Id: I84342703ac614e072b0cde8c6f5597dc8cffbc65
2019-12-04 16:50:52 -08:00
Treehugger Robot
7b34ebf447 Merge "Remove implicit outputs for the flattened APEX Make module" 2019-12-05 00:21:29 +00:00
Ivan Lozano
d094d4006f Exclude dirs from binder interface whitelisting
Exclude vendor/ and hardware/ from the manually written binder interface
whitelist.

Bug: 136279235
Test: interfaces in excluded directories are not checked against whitelist.
Change-Id: I0d640e23489b37d0c0787d5fca6bcdab10034109
2019-12-04 09:10:21 -08:00
Elliott Hughes
2cdbdf1093 Enable -Wpragma-pack warnings as errors.
The use of pragma pack(1) affects the packed-ness of every struct
definition that follows it in the translation unit, even in following
header files. This can lead to multiple translation units disagreeing
on whether a struct is packed.

Enable the warnings (as errors) that help spot this problem.

Bug: http://b/73971777
Test: treehugger
Change-Id: Id3096f35dff5dc8723d30d1305f1ed7ae8190a32
2019-12-04 08:48:45 -08:00
Logan Chien
e274fc9892 Run ABI checks for shared libs exported by APEX
This commit enables ABI checks for shared libs exported by APEX and
explicitly enabled ABI checks.

Bug: 145608479
Test: m com.android.resolv
Change-Id: I3b58178b0258df35fcc848e84642152516f6774f
2019-12-04 15:26:37 +00:00
Paul Duffin
46fc58ee8d Disable TestHostSnapshot test for non-linux build
Building sdk snapshots on anything other than linux glibc is not
supported at the moment.

Bug: 145598135
Test: m nothing
Change-Id: I34155252545e9f37c5361ed94a27a87024fcece2
2019-12-04 10:15:40 +00:00
Dan Willemsen
67d4258786 Test par file argument handling
This had been broken with my python3 launcher.

Test: build/soong/python/tests/runtest.sh
Change-Id: I0524e5a80244bf1080cb28237b23ef0d023e03dc
2019-12-03 23:54:04 -08:00
Jiyong Park
1753e58df7 Remove implicit outputs for the flattened APEX Make module
When flattened, the Make module for an APEX is a phony package for the
files in it. There is no output (either implcit or explicit) there.

Bug: 144338929
Test: m
Test: check the generated Android-<target>.mk file
Change-Id: I86df3b69f402a7e2d94bafa39f2aad3312d8c28b
2019-12-04 13:38:56 +09:00
Sundong Ahn
0d7dff48f5 Add system_ext_specific
The system_ext partition was created. So if java_sdk_library module is
installed to system_ext partition, .xml and .jar install path must be
changed to system_ext.

Bug: 143440787
Test: add system_ext_specific to java_sdk_module && make -j && check
system_ext parition

Change-Id: Ie0d0df426d4aa96ac89eb4215e7376eea3f03f54
2019-12-04 04:00:21 +00:00
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