Commit Graph

16307 Commits

Author SHA1 Message Date
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
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
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 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
TreeHugger Robot 18fbe81b9f Merge "Mark version_defaults as readonly" into pi-dev-plus-aosp 2018-04-13 21:39:43 +00:00
Wale Ogunwale 040ba07736 Merge "Finalizing P SDK" into pi-dev
am: 5de065e3ec

Change-Id: I552ebda180de398512b91addde17d8d48ec60624
2018-04-13 14:06:43 -07:00
Wale Ogunwale 5de065e3ec Merge "Finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Chih-Hung Hsieh d1caff4b2b Fix typo.
Bug: 73768157
Test: make checkbuild
Change-Id: Icf3a142500aa3f9849250ae0a895a61797b95376
2018-04-13 13:15:46 -07:00
Andreas Gampe 35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00
Chih-hung Hsieh 4991178be2 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" am: a72e1518e7
am: db18e11b86

Change-Id: I7f8fafc80a9be06fad05f801edad4510be2ed3f8
2018-04-13 12:44:10 -07:00
Chih-hung Hsieh a72e1518e7 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" 2018-04-13 19:26:04 +00:00
Wale Ogunwale 07a54b7fba Finalizing P SDK
Bug: 77588754
Test: builds
Merged-In: Iebb43a246016774150a3053f10bdedb0278b3e5d
Change-Id: Ied2e381795643aaf8c48e6c89d8ee66b8b5b15ed
2018-04-13 14:59:03 +00:00
Isaac Chen 5364f5a298 Enable vndk_package if BOARD_VNDK_VERSION is set
This is a first attempt to enable build system support to include
vndk_package automatically (if BOARD_VNDK_VERSION is set), so devices
don't need to add it via PRODUCT_PACKAGE manually.

Bug: b/67002788
Test: Booted on the x86 emulator and a physical device and checked
      their /system/lib*/vndk-* directories for vndk_package libraries.
    # The commands below are for the x86 emulator:
    $ lunch aosp_x86_64-userdebug; m -j
Change-Id: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
2018-04-13 15:33:44 +08:00
Dan Willemsen 693c7fb31b 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
2018-04-12 23:37:46 +00:00
Jiyong Park 0fa0052583 Allow native:vendor to vendor apks
Vendor apks should be able to reference native vendor libraries.
Vendor apks have worked around this by building without
LOCAL_SDK_VERSION, which then allowed to use all libs. However,
since vendor apks now needs to be built with SystemSDK, that
workaround can no longer be used.

Bug: 76398918
Test: BOARD_SYSTEMSDK_VERSION=P m -j
Merged-In: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
(cherry picked from commit 49a5b9785f)
2018-04-13 07:50:31 +09:00
Mathieu Chartier 1401d9cf81 Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" am: 65ba0bf59c
am: 4157c834db

Change-Id: I19f13a153e403b96c82d9f72a82042a2c5772288
2018-04-12 15:33:48 -07:00
Mathieu Chartier 65ba0bf59c Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" 2018-04-12 22:10:57 +00:00
Adam Seaton 8108edbc87 Update security string to 2018-05-05 on pi-dev
Bug: 74345861
2018-04-12 11:56:29 -07:00
Chih-Hung Hsieh 32427d6903 Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD
* Current default is not using lld.
* When USE_CLANG_LLD or LOCAL_USE_CLANG_LLD is true or 1,
  * Use *GLOBAL_LLDFLAGS instead of *GLOBAL_LDFLAGS.
    GLOBAL_LLDFLAGS should call lld and with correct lld flags.
  * set my_pack_module_relocations to false.

Bug: 73768157
Test: make checkbuild
Change-Id: I3e63cf8ae0865d01d2bc1f36e9304f4a5d092cb8
2018-04-12 11:00:06 -07:00
Jiyong Park a8750f0dfb Merge "Allow native:vendor to vendor apks" am: f2fc1418d3
am: 16a4fb198b

Change-Id: Ie5bbf02c8e8452381b38323d96d887126d268b86
2018-04-12 10:40:29 -07:00
Treehugger Robot f2fc1418d3 Merge "Allow native:vendor to vendor apks" 2018-04-12 17:21:59 +00:00
Mathieu Chartier aaca16f0f7 Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set
Allows modules to specify LOCAL_DEX_PREOPT_APP_IMAGE := false if they
have a profile.

Test: make
Change-Id: Ied7a8099b199904638dabdb09faf879d3216e73d
2018-04-12 17:02:30 +00:00
Ivan Podogov 0cf73852fc Merge "Add vendor properties blacklist" am: 2e2290cf1a
am: 869d4e5869

Change-Id: I43f875870aac9665fc3684a468f57bc669d05c3e
2018-04-12 03:18:23 -07:00
Treehugger Robot 2e2290cf1a Merge "Add vendor properties blacklist" 2018-04-12 10:08:10 +00:00
Jiyong Park 49a5b9785f Allow native:vendor to vendor apks
Vendor apks should be able to reference native vendor libraries.
Vendor apks have worked around this by building without
LOCAL_SDK_VERSION, which then allowed to use all libs. However,
since vendor apks now needs to be built with SystemSDK, that
workaround can no longer be used.

Bug: 76398918
Test: BOARD_SYSTEMSDK_VERSION=P m -j
Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
2018-04-12 17:14:48 +09:00
John Muir e3ebfbc16a Merge "notice_files: Disable NOTICE files for FAKE modules." am: 57fdba09a9
am: dd38cece28

Change-Id: Iad7afe5af043be949fb0833bd7141d2e8ad1f708
2018-04-11 15:48:02 -07:00
Ivan Podogov d572632f3d 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
2018-04-11 23:33:07 +01:00
Dan Willemsen 79657520ee Add variables for configuring Soong plugins
See the Soong commit for detailed usage.

Bug: 76168832
Test: define some variables, use them
Change-Id: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
Merged-In: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
(cherry picked from commit eaacf5b285)
2018-04-11 15:31:35 -07:00
John Muir 58d96b150e notice_files: Disable NOTICE files for FAKE modules.
Currently the build system will automatically attribute a NOTICE
file with the target of $(BUILD_PHONY_PACKAGE). This shouldn't
be the case.

Disable notice file inclusion for fake targets so that the
/fake_packages/blah_blah-timestamp paths don't show up in
NOTICE.xml.gz.

Bug: 77910458
Test: NOTICE files are not attributed to fake targets.
Change-Id: Ia942cac41b750efbd5a23d896d85ac0820ee8b4e
2018-04-11 13:07:13 -07:00
Anton Hansson 395092db03 Merge "Consolidate the logic for the sdk prebuilt module names." am: 9b72b53a24
am: 762e03ad41

Change-Id: I79ba2766028f2f26836a3a6d99eb5e8311f31921
2018-04-11 02:27:37 -07:00
Anton Hansson 9b72b53a24 Merge "Consolidate the logic for the sdk prebuilt module names." 2018-04-11 09:10:33 +00:00
TreeHugger Robot 0028485c94 Merge "Disable warnings for unknown modules in package-modules.mk" into pi-dev 2018-04-11 07:32:24 +00:00
TreeHugger Robot 6536add287 Merge "Delay eval to save memory use in create-suite-dependencies" into pi-dev 2018-04-11 07:15:17 +00:00