Commit Graph

16337 Commits

Author SHA1 Message Date
Calin Juravle
46661963c0 Merge "Update profile rules to support binary profiles" into pi-dev
am: cf4e0a074b

Change-Id: Ic6c1663681e20ad2972a30eda39ccc76cdbd02db
2018-04-23 11:28:31 -07:00
Calin Juravle
cf4e0a074b Merge "Update profile rules to support binary profiles" into pi-dev 2018-04-23 18:14:43 +00:00
Patrick Tjin
4ea7444789 build_image: default extfs reserved size to 0 on RO partitions.
am: 5ff758799c

Change-Id: I944ed917a69655930fafea3faf2c7529787b840a
2018-04-20 17:37:24 -07:00
TreeHugger Robot
9afed6c9ff Merge changes from topic "space_saver" into pi-dev
* changes:
  releasetools: Default journal size to 0 for system images.
  build_image: default extfs reserved size to 0 on RO partitions.
2018-04-21 00:25:32 +00:00
Calin Juravle
f99ab7580f Update profile rules to support binary profiles
Use full binary profiles instead or relying on text-based profiles. This
makes it easier to import actual profiles and do not require two rounds of
transformation.

Text based profiled probably didn't help too much anyway because if the
apps are updated the proguard names will change.

Modules are still free to define a text based profile using
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING. This is used for frameworks jars.

Test: make
Bug: 73313191

Change-Id: Ifd23dde21559fbcd015020905052bc588e275356
2018-04-20 14:54:22 -07:00
Nelson Li
d10e7ca801 Merge "build/make: auto generate Test config file for Google Benchmark Test" am: 2338a70f90
am: 30bdb776e2

Change-Id: I26bb828227df3b9b1d592d38a1934d8dae15a31f
2018-04-20 14:27:52 -07:00
Treehugger Robot
2338a70f90 Merge "build/make: auto generate Test config file for Google Benchmark Test" 2018-04-20 21:16:00 +00:00
Anton Hansson
789c8cd5ef Merge "Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts." am: 4ad0be36e3
am: 480e125b58

Change-Id: Id3b9bbf428650fba96aca05503738ec5e307005f
2018-04-20 01:31:24 -07:00
Anton Hansson
4ad0be36e3 Merge "Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts." 2018-04-20 08:17:20 +00:00
Colin Cross
d8305983f2 Merge "Fix echo when copying package-res.apk" am: f4b893165d
am: f773cb3c69

Change-Id: Ibc043fc14e265757d556d47d4553e56c5e5c77ed
2018-04-19 18:38:26 -07:00
Colin Cross
f4b893165d Merge "Fix echo when copying package-res.apk" 2018-04-20 01:21:49 +00:00
Colin Cross
a90f4b297f Fix echo when copying package-res.apk
Bug: 73724997
Test: m checkbuild
Change-Id: Iad9f46e01c40d1993e279c6ea6dd9c60932064c8
2018-04-19 15:28:59 -07:00
Dan Shi
558f136a9b Merge "Allow tests to be disabled for presubmit check" am: 4c7d849a1b
am: b5fd7133ae

Change-Id: If6ccceb0e85c88a1aa70eb939d93cfe97c9dc28e
2018-04-19 14:10:50 -07:00
Treehugger Robot
4c7d849a1b Merge "Allow tests to be disabled for presubmit check" 2018-04-19 20:43:54 +00:00
Ivan Podogov
020b22ead6 Merge "Add vendor properties blacklist" into pi-dev 2018-04-19 20:35:28 +00:00
Chih-hung Hsieh
4904fe1f14 Merge "When my_use_clang_lld, link with lld for host." am: 00ca2ecdcf
am: 1ada03ec15

Change-Id: I564226d3da0959111e4a4d6a7f1971a696071059
2018-04-19 10:16:04 -07:00
Chih-hung Hsieh
00ca2ecdcf Merge "When my_use_clang_lld, link with lld for host." 2018-04-19 17:03:02 +00:00
Anton Hansson
f5cefdcefb Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts.
This new variable allows specifying libraries like this:
LOCAL_SDK_VERISON := 25
LOCAL_SDK_LIBRARIES := org.apache.http.legacy,
which would automatically pick up the prebuilt OAHL prebuilt
from prebuilts/sdk/25/public/org.apache.http.legacy.jar

Test: In master with uiautomator.
Bug: 77575476
Change-Id: Id8d92176f5b608c2bcea622b6aed4aa27c32e000
2018-04-19 15:18:55 +01:00
Ivan Podogov
205a970594 Add vendor properties blacklist
This change allows removing some vendor properties from
(vendor|system/vendor)/build.prop file based on a blacklist.

For WearOS Unified Builds, which can change the product name depending on
the chosen locale, we use runtime-generated value for ro.build.fingerprint,
but since the ro.vendor.build.fingerprint cannot be generated the same way,
we always hit a "Mismatched fingerprints" error.

Bug: 71555551
Test: manual
Change-Id: Ifad793187e930a28fbf9325b03468c7ea86076b7
Merged-In: Ifad793187e930a28fbf9325b03468c7ea86076b7
(cherry picked from commit d572632f3d)
2018-04-19 10:03:42 +00:00
Nelson Li
eec9529de8 build/make: auto generate Test config file for Google Benchmark Test
BUG: 74844131
Test: cd bionic/; mm (auto generating the test config in out/)
      atest bionic-benchmarks (full testing in atest)
Change-Id: I0497eed876640893d0b82d4cde384d3608cf4875
2018-04-19 09:16:54 +00:00
Anton Hansson
703ab28b58 Merge "Switch make over to use the new prebuilt modules." am: 2944c11b1f
am: 424ee8d748

Change-Id: I25e8350db92ad48b848a9bd364fdb4aff1f3c473
2018-04-19 02:01:27 -07:00
Anton Hansson
2944c11b1f Merge "Switch make over to use the new prebuilt modules." 2018-04-19 08:48:29 +00:00
Colin Cross
7fce53dfcb Merge "Pass PLATFORM_VERSION_CODENAME to Soong" am: 7c84a01daf
am: 733057f12f

Change-Id: Idd0a1b706c992949d9425b016799b133150f836f
2018-04-18 15:35:06 -07:00
Colin Cross
7c84a01daf Merge "Pass PLATFORM_VERSION_CODENAME to Soong" 2018-04-18 22:22:25 +00:00
Tao Bao
bf46541b73 Merge "Remove the support for BRILLO_VENDOR_PARTITIONS." am: c904a89c93
am: cd64a00c03

Change-Id: Ic56244f0e323c7a56214cc10a29a75ea89ae0cbf
2018-04-18 14:51:23 -07:00
Treehugger Robot
c904a89c93 Merge "Remove the support for BRILLO_VENDOR_PARTITIONS." 2018-04-18 21:32:35 +00:00
Colin Cross
c051048ba7 Pass PLATFORM_VERSION_CODENAME to Soong
Pass PLATFORM_VERSION_CODENAME as Platform_sdk_codename, and
set Platform_sdk_final if PLATFORM_VERSION_CODENAME is REL.

Bug: 78224641
Test: m checkbuild
Change-Id: Ic082ca756d877ba51f45e89aa2ac267781a8d854
Merged-In: Ic082ca756d877ba51f45e89aa2ac267781a8d854
(cherry picked from commit f6d3fff907)
2018-04-18 12:42:46 -07:00
Colin Cross
f6d3fff907 Pass PLATFORM_VERSION_CODENAME to Soong
Pass PLATFORM_VERSION_CODENAME as Platform_sdk_codename, and
set Platform_sdk_final if PLATFORM_VERSION_CODENAME is REL.

Bug: 78224641
Test: m checkbuild
Change-Id: Ic082ca756d877ba51f45e89aa2ac267781a8d854
2018-04-18 12:40:16 -07:00
Tao Bao
36d7c5666d Remove the support for BRILLO_VENDOR_PARTITIONS.
It was initially introduced in commit
2e735ca34e, where it packs additional
vendor images into target_files zip in order to generate OTAs. We can
acheive the same goal with INSTALLED_RADIOIMAGE_TARGET, which is the way
being actively used across all targets, including IoT (the former
Brillo) targets.

Bug: 78201540
Test: `m dist` with aosp_marlin-userdebug
Test: Code search shows no active user of BRILLO_VENDOR_PARTITIONS.
Test: `python -m unittest test_add_img_to_target_files`
Change-Id: I8803d5377b5a39304a701cceafb243f9a228347d
2018-04-18 09:50:47 -07:00
Anton Hansson
9235faa9a4 Switch make over to use the new prebuilt modules.
There are a couple more places throughout the tree that use the old
modules, and I will update those next before deleting the old module
definitions.

Bug: 77525052
Test: make droid
Change-Id: I9385ae34cc1646cbd4e249d9e96a0116296f139a
2018-04-18 16:15:05 +01:00
Chih-Hung Hsieh
4955b857c4 When my_use_clang_lld, link with lld for host.
When USE_CLANG_LLD is true, my_use_clang_lld is true,
and *GLOBAL_LLDFLAGS will be used instead of *GLOBAL_LDFLAGS.

Bug: 73768157
Test: make checkbuild
Change-Id: I2598b72e9edde32f8e57df860571fd107c005540
2018-04-17 15:30:24 -07:00
Treehugger Robot
d36cfa333a Merge "Don't use export with BUILD_ID" 2018-04-17 21:12:45 +00:00
Adam Seaton
1c533135e3 Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev
am: 62e48ce1a4

Change-Id: I47189cbdecc76011436194d17c5d731d8f1358a3
2018-04-17 13:48:55 -07:00
TreeHugger Robot
62e48ce1a4 Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev 2018-04-17 20:09:20 +00:00
TreeHugger Robot
182350ff27 Merge "Don't use export with BUILD_ID" into pi-dev-plus-aosp 2018-04-17 19:39:51 +00:00
Dan Willemsen
52e14a617d Merge "Add variables for configuring Soong plugins" into pi-dev 2018-04-17 19:35:35 +00:00
Dan Shi
639c6ccf7a Allow tests to be disabled for presubmit check
A test can be disabled in two ways:
1. Add the test name to ALL_DISABLED_PRESUBMIT_TESTS variable.
   Integration tests (tests inside TradeFed) can only be disabled in
   this way.
2. In module config, set LOCAL_PRESUBMIT_DISABLED to true. This works
   for tests with build target.

This change allows tests to be skipped in presubmit check to be saved in
a list that's included in test-mappings.zip build artifact.

Bug: 74971025
Test: m dist -j test-mapping
Change-Id: I6e3016b017ce1ade024dc4ded72a10c778b88e7f
2018-04-17 12:07:31 -07:00
Dan Willemsen
77f23c3ac8 Don't use export with BUILD_ID
It's not necessary, and all the tools that read this file have been
updated.

Bug: 73959648
Test: cs for uses
Change-Id: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
Merged-In: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
(cherry picked from commit c0d7f6ed8b)
2018-04-17 11:20:33 -07:00
Anton Hansson
07fbf1025f Update apidiff.mk to use the sdk-name macro.
This internal change complements aosp/661901, which introduced the sdk
module name macro. apidiff.mk doesn't exist in aosp.

Bug: 77525052
Test: make droid
Change-Id: Ia347d8ffef1a7d28508256b4a5c984b3e07ed998
(cherry picked from commit d4e657a227)
2018-04-17 13:01:53 +00:00
Søren Gjesse
6e65019a45 Merge "Keep the collected Proguard configuration" am: 0c2a796853
am: a246c6a84a

Change-Id: I2eae581750bdb3fa51649c7b130e3169fa80877f
2018-04-17 00:13:15 -07:00
Søren Gjesse
0c2a796853 Merge "Keep the collected Proguard configuration" 2018-04-17 07:01:57 +00:00
Treehugger Robot
eec144223a Merge "Mark version_defaults as readonly" 2018-04-17 03:05:22 +00:00
Dan Willemsen
1f1e2e4eea Mark version_defaults as readonly
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.

Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
Merged-In: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-17 01:30:08 +00:00
Andrew Hsieh
f88438aa37 Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev
am: 0dd11dc0b5

Change-Id: I192316dd07972167e2d5e4a687e15f7f1611f0f8
2018-04-16 16:41:23 -07:00
Andrew Hsieh
0dd11dc0b5 Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev 2018-04-16 23:12:19 +00:00
Dan Willemsen
b7b7a97c2c Don't use export with BUILD_ID
It's not necessary, and all the tools that read this file have been
updated.

Bug: 73959648
Test: cs for uses
Change-Id: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
Merged-In: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
2018-04-16 23:05:10 +00:00
Andreas Gampe
875a95a494 Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f

Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Treehugger Robot
1cd44482db Merge "Revert "Build: Support for compiled-classes file"" 2018-04-16 16:33:24 +00:00
Søren Gjesse
9fbdd9ec5a Keep the collected Proguard configuration
This will work for both R8 and Proguard

Test: m -j Settings && "manually check .../proguard_coniguration file"
Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-16 09:16:35 +02:00
Chih-Hung Hsieh
3dd4d3ebbc Merge "Fix typo." am: 5576f9a6ca
am: ffcdc18a8c

Change-Id: I1c107e3e18602da8dfbb8ca48426252e86161db5
2018-04-14 16:06:14 -07:00