Commit Graph

50407 Commits

Author SHA1 Message Date
Xin Li 0590d456e0 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Ide25ddcfa9a928b3affff72c2ce20e77865bd7d5
2019-05-13 15:57:57 -07:00
Tao Bao bc7e3f98f4 Merge "Add sign_apex.py that signs a given APEX file." 2019-05-13 22:47:24 +00:00
Mikhail Naganov 79c61ba50e Remove USE_XML_AUDIO_POLICY_CONF build flag
This flag is no more used by the build files and should
be removed.

Bug: 132435217
Test: make
Change-Id: Icbd2359da659290ce4fba1a11ba6da76f23679da
2019-05-13 14:02:43 -07:00
Tao Bao e7354ba447 Add sign_apex.py that signs a given APEX file.
This CL moves SignApex() from sign_target_files_apks into apex_utils,
and adds sign_apex that allows signing a standalone APEX file directly.

Test: Run the following command and check the output file.
$ build/make/tools/releasetools/sign_apex.py \
     -v \
     --container_key \
         build/make/target/product/security/testkey.x509.pem \
     --payload_key external/avb/test/data/testkey_rsa4096.pem \
     --payload_extra_args \
         "--signing_helper_with_files ./signing-helper.sh" \
     foo.apex \
     signed-foo.apex
Test: Run sign_target_files_apks.py on crosshatch target_files.zip.
Change-Id: I4b2422fd5cb1c60a3aa94511475e2a0e5b1666ca
2019-05-13 12:41:26 -07:00
Anton Hansson 879b007555 Make PRODUCT_CHARACTERISTICS a single-valued variable
Values should be comma-separated, and things won't go down well
if there are multiple words in this variable.

Bug: 123783710
Test: Put this in product_config.mk and ran multiproduct_kati:
      ifneq (1,$(words $(PRODUCT_CHARACTERISTICS)))
        $(error oops)
      endif
Change-Id: I5627f416093d68d8d19916a914739686b74d392f
2019-05-13 18:15:32 +01:00
Pete Gillin 0077fa356e Merge "Whitelist javax.annotation.processing for inclusion in core-oj."
am: 738b9963d5

Change-Id: I3106fdfcf7bec4d7e4641cd655fceca19775f0a7
2019-05-13 04:53:34 -07:00
Pete Gillin 738b9963d5 Merge "Whitelist javax.annotation.processing for inclusion in core-oj." 2019-05-13 11:37:43 +00:00
Anton Hansson 6d25fc6657 Make implicit 32-bit apps on 64-bit target an error
This has been a warning for a long time. Make it an error instead.

Once this has been verified to not cause any problems, it can
likely be changed to instead default to setting
TARGET_SUPPORTS_64_BIT_APPS := true.

Test: build_test
Change-Id: I0d03fed2085009c64880a594d5a3aadf72187e60
2019-05-13 11:13:20 +01:00
Colin Cross fd7da36c8e Merge "Use a copy of dexpreopt.config"
am: 976dd58b34

Change-Id: I4c3f6ea7e55f6e09d054bb4aa797d407b9bc1822
2019-05-10 21:20:51 -07:00
Colin Cross 976dd58b34 Merge "Use a copy of dexpreopt.config" 2019-05-11 04:11:58 +00:00
Tao Bao 189a8dff61 Merge "releasetools: Unzip all files when generating image archive."
am: e77dbd2a62

Change-Id: Ibd6965c0b9517fe24e6f3267dc55700f3f320d18
2019-05-10 21:10:47 -07:00
Tao Bao e77dbd2a62 Merge "releasetools: Unzip all files when generating image archive." 2019-05-11 03:48:02 +00:00
Tao Bao 1dac1d4164 releasetools: Unzip all files when generating image archive.
Commit 7df64c3e starts to call common.LoadInfoDict() when generating
image archive, which reads additional files under BOOT/, RECOVERY/ and
ROOT/. Unzip everything from the target_files.zip.

Bug: 132456827
Test: Run img_from_target_files.py on previously failing
      target_files.zip.
Change-Id: I22ee57c4f765bee9494478bf115b1581877401f4
2019-05-10 15:57:20 -07:00
Pete Gillin 8acb88b50c Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
am: aa448d138b

Change-Id: I12ef0a12aea45a9782105ff3324d8f9c773a1817
2019-05-10 05:16:20 -07:00
Pete Gillin 0ad2ef677d Whitelist javax.annotation.processing for inclusion in core-oj.
Bug: 123891440
Test: EXPERIMENTAL_USE_OPENJDK9=true make droid

(cherry picked from commit ec99530de3)

Merged-In: I0fc7a6841f34361883785479671f4422d720ce00
Change-Id: I70dbb89ca29ec1bb47ea5a1cf27b324d354aca11
2019-05-10 13:07:02 +01:00
Pete Gillin aa448d138b Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 2019-05-10 11:50:08 +00:00
Dimitry Ivanov d85091b9eb Merge "Filter out .native_bridge static libs from NOTICE files"
am: 62ae23267f

Change-Id: I306ab34b9b0a196195ce5d9abb34de4354dccf0e
2019-05-10 02:06:14 -07:00
Dimitry Ivanov 62ae23267f Merge "Filter out .native_bridge static libs from NOTICE files" 2019-05-10 08:17:15 +00:00
Colin Cross 51ba1df2f0 Use a copy of dexpreopt.config
Move the dexpreopt.config passed to Soong to out/soong/dexpreopt.config
and let it write a new copy in a rule and pass the path back to make
as DEX_PREOPT_CONFIG_FOR_MAKE.

Bug: 132379813
Test: m checkbuild
Change-Id: Iac29beac3af8864d36d1563ce42bed11b685548d
2019-05-09 22:16:13 -07:00
Xin Li 7d2fb27e65 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 8a39705283 -s ours
am skip reason: subject contains skip directive

Change-Id: Icaca821460cf80ee26fe0c74f84693e18a89701a
2019-05-09 17:26:36 -07:00
Xin Li 5424463388 [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 8ba7af7849 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9d5142fca1dc385ee0774cfa4e1e5f24ff92f60
2019-05-09 15:50:56 -07:00
Xin Li 8a39705283 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:51 +00:00
Martin Stjernholm 5b657c75ac Merge "Remove libc_malloc_{debug,hooks} from the system image."
am: eba4d2312a

Change-Id: I423c0d2928ed3f62b74d8425450b051913d654ac
2019-05-09 12:50:54 -07:00
Daniel Norman c937afafa1 Merge "Fixes typo when calling process_dynamic_partitions_info_txt."
am: 74d91295fd

Change-Id: I9c706c816308966d27482f949abcf3cd83082aca
2019-05-09 12:49:59 -07:00
Treehugger Robot eba4d2312a Merge "Remove libc_malloc_{debug,hooks} from the system image." 2019-05-09 19:13:43 +00:00
Treehugger Robot 74d91295fd Merge "Fixes typo when calling process_dynamic_partitions_info_txt." 2019-05-09 18:53:55 +00:00
Xin Li 8ba7af7849 DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: I6381f0300194fbe153b951eb30c5228b75de90c5
2019-05-09 09:27:02 -07:00
dimitry a19987d3c2 Filter out .native_bridge static libs from NOTICE files
LOCAL_STATIC_LIBRARIES may contain .native_bridge suffix
when built for translated targets.

This CL makes the NOTICE file exception apply for them too.

Bug: http://b/77159578
Test: make
Change-Id: Ic8a18f06afa0c460751f21587b7f751ac0ae4a3f
2019-05-09 16:35:41 +02:00
Pete Gillin 273b25f9fd Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy
from when the 8 -> 9 toolchain upgrade was happening. That migration
is done and the variable only affects the language level, so it should
have a name that reflects that. (The current situation would be
especially confusing if we started a 9 -> 11 toolchain upgrade,
presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11,
since the two settings look incompatible but are actually orthogonal.)

The current variable historically allowed a value or "1.8" which meant
"use the OpenJDK 9 toolchain but target language level 8". That value
no longer has any meaning and the new variable doesn't allow it.

Bug: 131678633
Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true`
Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53
Change-Id: Ic1f76a656bea30713b356a28e82f908a46933893
Test: Audit all mentions of the old string here and downstream
2019-05-09 15:30:39 +01:00
Martin Stjernholm d1ed63d2aa Merge "Extend library absence check to Bionic libs and all ART debug libs."
am: f26bef86ec

Change-Id: Ia4fd7c2eda96b16401c88052067400e2259c6ddf
2019-05-09 05:06:47 -07:00
Martin Stjernholm f26bef86ec Merge "Extend library absence check to Bionic libs and all ART debug libs." 2019-05-09 11:51:37 +00:00
Jiyong Park bcbb7f734a Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set"
am: 333f7b5fcc

Change-Id: I689fc63918eed509f83788482fc6b7e0cbed2ae9
2019-05-09 01:56:16 -07:00
Treehugger Robot 333f7b5fcc Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set" 2019-05-09 08:48:05 +00:00
Isaac Chen d81b1d0fab Merge "Add PRODUCT_EXTRA_VNDK_VERSIONS product variables"
am: 765e433d24

Change-Id: I113ad50950c186068e8c6c143b45a87c16346231
2019-05-09 01:36:04 -07:00
Treehugger Robot 765e433d24 Merge "Add PRODUCT_EXTRA_VNDK_VERSIONS product variables" 2019-05-09 08:25:23 +00:00
Jiyong Park 02426e6118 Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set
TARGET_FLATTEN_APEX and ro.apex.updatable cannot be independently set.
For a device where updating APEXes is not supported, ro.apex.updatable
should not be set (or set to false) and TARGET_FLATTEN_APEX should be
set to true. For APEX-supporting devices, it is the opposite;
ro.apex.updatable == true and TARGET_FLATTEN_APEX is false (or not set).

To ensure this relationship, TARGET_FLATTEN_APEX is by default set to
true, and overridden to false when updatable_apex.mk is inherited.

Bug: 130623080
Test: choosecombo to Pixels 2 and later; get_build_var
TARGET_FLATTEN_APEX returns false.
choosecombo to the original Pixel and other non-Pixel targets;
get_build_var TARGET_FLATTEN_APEX returns true.
choosecombo to the cuttlefish; get_build_var TARGET_FLATTEN_APEX
returns false

Merged-In: Id73a594dd9838457e68e2793122592c11a84fc83
Change-Id: Id73a594dd9838457e68e2793122592c11a84fc83
(cherry picked from commit 18411a42f0)
2019-05-09 09:56:55 +09:00
Dan Willemsen 35aec48ac3 Merge "Move BUILD_[HOST_]SHARED_TEST_LIBRARY to obsolete list"
am: 03aebddf1d

Change-Id: I2bbfd7b85b349d0a576562915118c05360d7b183
2019-05-08 17:10:25 -07:00
Martin Stjernholm e115e3cf07 Extend library absence check to Bionic libs and all ART debug libs.
Test: m systemimage
Test: build/soong/build_test.bash
Bug: 124293228
Change-Id: I1a25d8d45668638b7eb0d39ded9cad3ed30db33c
2019-05-09 01:07:56 +01:00
Treehugger Robot 03aebddf1d Merge "Move BUILD_[HOST_]SHARED_TEST_LIBRARY to obsolete list" 2019-05-08 23:44:47 +00:00
Daniel Norman 714bd12861 Fixes typo when calling process_dynamic_partitions_info_txt.
Test: Running merge_target_files.py
Change-Id: Ieddfbfe524824844fc12cc10347f667332149f7c
2019-05-08 16:20:02 -07:00
Dan Willemsen cecb32f2af Merge "Deprecate next set of make module types"
am: 2cfbde6f38

Change-Id: I316acef9e09e909a255ef3dcbcea808023fabf4a
2019-05-08 15:37:44 -07:00
Treehugger Robot 2cfbde6f38 Merge "Deprecate next set of make module types" 2019-05-08 22:19:53 +00:00
Tao Bao df24a30b5d Merge "releasetools: Update the comments regarding selinux_fc."
am: 45f74b104b

Change-Id: I570d584f8eadcfacfc4a91470137e2c4f080d9df
2019-05-08 15:14:35 -07:00
Hridya Valsaraju 1c87bffec6 Merge "Move ro.boot.dynamic_partitions to vendor/build.prop"
am: e591ef32a0

Change-Id: I54134846c9b6657bc0987ca18348f23353d8e3b9
2019-05-08 15:09:41 -07:00
Treehugger Robot 45f74b104b Merge "releasetools: Update the comments regarding selinux_fc." 2019-05-08 21:58:43 +00:00
Treehugger Robot e591ef32a0 Merge "Move ro.boot.dynamic_partitions to vendor/build.prop" 2019-05-08 21:39:26 +00:00
Tao Bao 13ebc021ec releasetools: Update the comments regarding selinux_fc.
The former comment no longer applies, as we have been always packing
META/file_contexts.bin in a target_files.zip (commit aa7318c3, since
Nougat), and we no longer look for the one under BOOT/RAMDISK/ (commit
d14b8956, since Q).

Test: N/A
Change-Id: I03f361234bf440e942f21e5a624862590248544b
2019-05-08 12:40:27 -07:00
Dan Willemsen eb22c940ac Move BUILD_[HOST_]SHARED_TEST_LIBRARY to obsolete list
The implementation of these rules have been an $(error) for almost 3
years.

Test: treehugger
Change-Id: I2e258d297172532c0993c8cb8a2e19ad03ea281d
2019-05-08 12:37:10 -07:00
Dan Willemsen fd84a92b82 Deprecate next set of make module types
BUILD_AUX_EXECUTABLE
 BUILD_AUX_STATIC_LIBRARY

These shouldn't be used anymore, they were an intermediate state to
build some firmware that is no longer being built in Android.

 BUILD_HOST_FUZZ_TEST
 BUILD_HOST_NATIVE_TEST
 BUILD_HOST_STATIC_TEST_LIBRARY
 BUILD_NATIVE_BENCHMARK
 BUILD_STATIC_TEST_LIBRARY

There are no users of these left.

Bug: 130735607
Bug: 130735003
Bug: 130691889
Bug: 130723134
Bug: 130722660
Bug: 130734558
Bug: 130735594
Test: build_test & check logs
Change-Id: I8a9385040316495f7e7262d045be871e91712920
2019-05-08 12:27:53 -07:00
Tao Bao a2a708a616 Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon."
am: 246a30a1cb

Change-Id: If58241d1c5af2051f3bb40d503b5ee45c6a46b54
2019-05-08 11:52:14 -07:00