Commit graph

41818 commits

Author SHA1 Message Date
Dan Willemsen
19bd9b99ce Remove obsolete BRILLO variable
Test: none
Change-Id: Ia4474927709ccfa1ff76f5dda1d8aa13ef9d1004
2018-03-10 15:23:12 -08:00
Dan Willemsen
ad8b133476 Merge "Fix xz with SANITIZE_HOST"
am: b16a5b8d17

Change-Id: Ia87634d0e4ca8aefba556dd627bb62def9f6daa6
2018-03-10 09:11:58 +00:00
Treehugger Robot
b16a5b8d17 Merge "Fix xz with SANITIZE_HOST" 2018-03-10 09:03:39 +00:00
Dan Willemsen
6b3a8380cc Fix xz with SANITIZE_HOST
There isn't an Address Sanitizer prebuilt of xz, so always use the same
xz prebuilt.

Bug: 36130900
Test: SANITIZE_HOST=address m nothing; check ninja file
Test: m libc
Change-Id: Iba3599d4289ad5afb573dbec5ac8fc463668b1c6
2018-03-09 22:38:37 -08:00
Dan Willemsen
0a0181bb96 Merge "Use xz prebuilt"
am: 8e287901c3

Change-Id: Ie63abd01335f2565581faf32f1c235b5d7f24892
2018-03-10 03:05:54 +00:00
Treehugger Robot
8e287901c3 Merge "Use xz prebuilt" 2018-03-10 03:00:29 +00:00
Nan Zhang
2bc83406a0 Merge "Fix droiddoc variable name in clear_vars.mk"
am: 6991c1a35d

Change-Id: I5d5fc6958e65b69e35dafb47db746f7791cd836f
2018-03-09 22:55:58 +00:00
Treehugger Robot
6991c1a35d Merge "Fix droiddoc variable name in clear_vars.mk" 2018-03-09 22:33:50 +00:00
Dan Willemsen
893859573d Use xz prebuilt
Instead of whichever xz happens to be on the PATH.

Bug: 36130900
Test: m
Change-Id: Ib37d8db4e935ef8f69f3d43b5065c22d34028cf3
2018-03-09 12:56:01 -08:00
Nan Zhang
ccdecc7e02 Fix droiddoc variable name in clear_vars.mk
Test: m -j
Bug: b/70351683
Change-Id: I8cb4429a7e6bebde541a09f0328dddb937c0aced
2018-03-09 12:39:34 -08:00
Tao Bao
934e04d1a3 Merge "releasetools: Create StreamingPropertyFiles class."
am: 32dfa4914d

Change-Id: I10d430bd204ab08efe17410920c280bf8440db35
2018-03-09 20:07:16 +00:00
Treehugger Robot
32dfa4914d Merge "releasetools: Create StreamingPropertyFiles class." 2018-03-09 19:56:18 +00:00
Nan Zhang
6123183ad5 Merge "Rename stubsjar to stubsSrcjar for droiddoc"
am: d29f3e7026

Change-Id: I828a39593fb33ac4a6a210ee04dc58237fca14b7
2018-03-09 10:04:24 +00:00
Treehugger Robot
d29f3e7026 Merge "Rename stubsjar to stubsSrcjar for droiddoc" 2018-03-09 09:42:29 +00:00
Anton Hansson
3ab72f26ff Merge "Enforce specifying sdk/private for apps. DO NOT MERGE"
am: 5a49a36a55  -s ours

Change-Id: I1d69f1430fba616ead707df855e11d28c9bf98a3
2018-03-09 09:25:51 +00:00
Anton Hansson
5a49a36a55 Merge "Enforce specifying sdk/private for apps. DO NOT MERGE" 2018-03-09 09:18:06 +00:00
Dan Willemsen
d34cc3915c Merge "Support a pre-extracted PDK zip"
am: 1cfafdd9fc

Change-Id: I5425a83e6a5c3969cdb63fe8f2a375c94e058892
2018-03-09 04:49:46 +00:00
Treehugger Robot
1cfafdd9fc Merge "Support a pre-extracted PDK zip" 2018-03-09 04:26:48 +00:00
Nan Zhang
89f12b00f0 Rename stubsjar to stubsSrcjar for droiddoc
Test: m -j core-docs
Bug: b/70351683
Change-Id: I90e4df3ba002c7488f3a80066bf3723b6f299b04
2018-03-08 17:29:16 -08:00
Jiyong Park
04ca4e7e9a Merge "Remove unnecessary link-type check"
am: 0b4b321565

Change-Id: If9c67f868a1480cf084747b41a67a4740edd735e
2018-03-09 00:33:58 +00:00
Treehugger Robot
0b4b321565 Merge "Remove unnecessary link-type check" 2018-03-09 00:21:21 +00:00
Tao Bao
ae5e4c30fe releasetools: Create StreamingPropertyFiles class.
This CL breaks down ComputeStreamingMetadata() into mutiple member
functions of StreamingPropertyFiles class, which correspond to the
two-pass logic when generating streaming property files (aka streaming
metadata).

StreamingPropertyFiles.Compute() does the work for the first pass, by
putting placeholders before doing initial signing. Finalize()
corresponds to the second pass, where the placeholders get replaced with
actual data. Verify() can be optionally called to assert the correctness
of the work.

The separation between Compute() and Finalize() is to allow having
multiple StreamingPropertyFiles instances (in coming up CLs). This way
we can call Compute() multiple times for each instance, followed by only
one call to SignOutput(). And similarly for Finalize().

Bug: 74210298
Test: Generate an A/B OTA package. Check the METADATA entry.
Test: python -m unittest test_ota_from_target_files
Change-Id: I45be0372a4863c4405e6d8e20bcb9ccdc29e7e11
2018-03-08 14:59:42 -08:00
Dan Willemsen
0663f685c2 Support a pre-extracted PDK zip
Pre-extracting the zip files are more sustainable for git, so that
objects can be shared if unchanged, rather than the 900MB zip file
changing on every build.

This also has the advantage that we could put an Android.bp file inside
the PDK, and Soong would just pick it up.

Bug: 68767391
Test: Build mini_arm64 PDK with platform.zip
Test: Build mini_arm64 PDK with extracted zip file
Change-Id: I16db030a731aea55b69c1d6e2260dbd70b167544
2018-03-08 13:50:21 -08:00
Ivan Lozano
bd3c11fd02 Merge "Add minimal-runtime support for integer overflows."
am: b5399007ca

Change-Id: I6963ed5b9dc08a9419af4b202e79ddc30ffd3804
2018-03-08 20:39:43 +00:00
Ivan Lozano
b5399007ca Merge "Add minimal-runtime support for integer overflows." 2018-03-08 20:12:10 +00:00
Baligh Uddin
946752cb24 Merge "releasetools: Fix the broken validate_target_files.py."
am: 1617db36af

Change-Id: I814e200ce3f30378fbf023321adf6b6ab5106edf
2018-03-08 16:01:38 +00:00
Baligh Uddin
1617db36af Merge "releasetools: Fix the broken validate_target_files.py." 2018-03-08 15:50:15 +00:00
Anton Hansson
62c7de3792 Enforce specifying sdk/private for apps. DO NOT MERGE
All apps in master comply with this now, but new offenders
are being added daily. This will ensure compliance going
forward.

Test: build/soong/build_test.bash
Bug: 73535841

Change-Id: If28049750a9787bf455f72402e624dbddf842253
2018-03-08 13:19:36 +00:00
Nicolas Geoffray
9bb6b435fa Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
am: 2bff9a7c79

Change-Id: Ib0ff912ce3bfa34cf29f2b3c219de6e228b6dc96
2018-03-08 09:05:19 +00:00
Nicolas Geoffray
2bff9a7c79 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" 2018-03-08 08:57:44 +00:00
Jiyong Park
98a4f52c28 Remove unnecessary link-type check
Modules from Soong do not have dependency specified (via
LOCAL_JAVA_LIBRARIES). So, link-type check 'from' them doesn't make
sense. Resetting my_warn_types and my_allowed_types

Bug: 69899800
Test: m -j checkbuild on aosp_walleye, aosp_sailfish
Test: build/soong/build_test.bash --dist
Change-Id: I2a409e64f388bd8cb9336be589bf6af33e48a6f4
2018-03-08 15:23:08 +09:00
Tao Bao
c63626b4a3 releasetools: Fix the broken validate_target_files.py.
The file was broken due to earlier touches:
 - Missing 'import zipfile';
 - Mismatching arguments when calling GetSparseImage().

Bug: 73996151
Test: Run validate_target_files.py with a walleye-target_files.zip.
Test: pylint --rcfile=pylintrc validate_target_files.py
Change-Id: I3692bd51fb27a3da698e06b75155e84502549f66
2018-03-07 21:45:40 -08:00
Simran Basi
4fbe95bef0 Merge "build/make: Add default suite for all native tests/benchmarks"
am: f74c027301

Change-Id: I07e53997867a684d0f1b8c8934ddd2076722e8db
2018-03-08 01:53:58 +00:00
Treehugger Robot
f74c027301 Merge "build/make: Add default suite for all native tests/benchmarks" 2018-03-08 01:38:04 +00:00
Mathieu Chartier
6a3744ba11 Merge "For user and userdebug generate error if DEXPREOPT is not enabled"
am: afc270b066

Change-Id: I0f1913673dc9732325b86ea0796295bc5967e1a1
2018-03-07 22:44:58 +00:00
Colin Cross
10b24dba79 Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb
am: 78d5ea8e9b

Change-Id: Id0ba6f9c089d1c59d119ec39e1fae1e0b70ac03b
2018-03-07 22:38:05 +00:00
Mathieu Chartier
afc270b066 Merge "For user and userdebug generate error if DEXPREOPT is not enabled" 2018-03-07 22:34:14 +00:00
Colin Cross
78d5ea8e9b Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb
* changes:
  Remove missed PRODUCT_AAPT_FLAGS
  Allow soong java libraries to include exported resources and proguard flags
  Silence more duplicate path warnings
  Remove framework_res_package_export_deps
2018-03-07 22:25:30 +00:00
Mathieu Chartier
2594230d83 For user and userdebug generate error if DEXPREOPT is not enabled
This prevents cases where system_server is running in interpreter
only mode.

Removed unused flag in product.mk

(cherry-picked from commit 27f4287406)

Bug: 74209329
Test: WITH_DEXPREOPT=false make
Merged-In: I4ab3afed95a5baf77d0cd089dafaa18bcc1913e5
Change-Id: I4ab3afed95a5baf77d0cd089dafaa18bcc1913e5
2018-03-07 22:21:43 +00:00
Simran Basi
d63a8153da build/make: Add default suite for all native tests/benchmarks
Not all native tests have the "tests" tag so adjust the logic to be:
NATIVE_TESTS||NATIVE_BENCHMARKS||(APPS&&tags==tests)

Bug: 74339384
Test: Rebuilt module-info.json, verified native tests now have
      their suite set to null-suite and have auto_test_config=True
      Double checked a frameworks App unittest as well.

Change-Id: Idea00adcebfc1a78b0c6d8ade40feddb1e90ed83
2018-03-07 12:36:55 -08:00
Colin Cross
8dad6c62d4 Remove missed PRODUCT_AAPT_FLAGS
PRODUCT_AAPT_FLAGS was removed by Iacc914114616b5bd19d9a1011802f4f9bca9bc19,
remove one more that it missed.

Test: m checkbuild
Change-Id: I31ea4954f5af5af37f13210925ed5d622625d71b
2018-03-07 09:48:33 -08:00
Colin Cross
7874138a8a Allow soong java libraries to include exported resources and proguard flags
Test: m checkbuild
Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-03-07 09:48:33 -08:00
Colin Cross
f6799e859a Silence more duplicate path warnings
Silence warnings when merging header jars that were missed by
Ifb67dbf7734b5f53941d110f578c4fe642e36005.

Bug: 69316739
Test: m checkbuild
Change-Id: I5cfea62e46d99f9b315a589d8915bf62307220aa
2018-03-07 09:47:41 -08:00
Colin Cross
6e136922f3 Remove framework_res_package_export_deps
framework_res_package_export is now always either the prebuilt
android.jar from an SDK or a package-export.apk generated by
Soong, so the dependency on R.stamp is never useful.  Remove
all assignments to framework_res_package_export_deps, and replace
usages with frameworks_res_package_export.

Test: m checkbuild
Change-Id: If484e9eb08061cb0ed0697755f13db71d741aaab
2018-03-07 09:47:41 -08:00
Roland Levillain
209b96e152 Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"
This reverts commit 86a596c711.

Reverting as that commit breaks ART tests' results (see
b/73804944).

Test: m test-art-host
Bug: 73804944
Bug: 26275726
Change-Id: I06af4b170d845d3e55e044c28ec22d4b3ca3dede
2018-03-07 16:25:55 +00:00
Justin Yun
ccf495304e Merge "Add ld.config.txt for wearables"
am: f99efebc75

Change-Id: Ib120ac820784ab4e0f96611049d3522b61aa3f03
2018-03-07 08:00:35 +00:00
Treehugger Robot
f99efebc75 Merge "Add ld.config.txt for wearables" 2018-03-07 07:55:40 +00:00
Tao Bao
bfecf9b4cb Merge "releasetools: Separate streaming metadata computation into functions."
am: 737bc2b082

Change-Id: Idada35c528c2f4be720ebba4870f43c0329e1a65
2018-03-07 04:35:34 +00:00
Justin Yun
61c412ed05 Add ld.config.txt for wearables
When BOARD_VNDK_VERSION is set, the required VNDK libs for vendor
modules are installed in vndk directory.
The default namespace configuration cannot reach those directories
and fails to link the required libs.
By installing ld.config.txt, the namespace configurations for each
build target will be selected automatically. This does not affect
the devices that requires default namespace configurations.

Bug: 74242105
Test: lunch sdk_gwear_x86-userdebug; make -j; emulator
Change-Id: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
2018-03-07 13:27:24 +09:00
Tao Bao
737bc2b082 Merge "releasetools: Separate streaming metadata computation into functions." 2018-03-07 04:24:13 +00:00