Commit Graph

17954 Commits

Author SHA1 Message Date
Elisa Pascual Trevino
5d1f2a53ef Update platform security string to 2018-11-05 on pi-dev & master
Bug:114110585
(cherry picked from commit dd737c0961)

Change-Id: I0e8d07c6d7333414c6099f718a122d7b343d8e92
2018-09-10 22:35:07 +00:00
Dan Willemsen
921f581bef Mark more sdk targets as PHONY
These are used in various dist-for-goal targets even if we're not
currently building the sdks, so they always need to be marked with
.PHONY.

Test: m dist
Change-Id: I1e11ae37c6d0fd6ef8a3e293cf7409773c1bf3ab
2018-09-10 15:14:09 -07:00
Colin Cross
8fb525db71 Add soong_cc_prebuilt.mk
Add soong_cc_prebuilt.mk for Soong modules to use so they can avoid
going through all of prebuilt_internal.mk, dynamic_binary.mk and
binary.mk.  Also moves stripping support into Soong.

Relands I8b37dda2b449b6b5d48d5b983f43de452f494a1e with fixes for
builds with GENERATE_BREAKPAD_SYMBOLS=true

Bug: 113936524
Test: m checkbuild
Change-Id: Id41cd76ccb1b5bb6ac43b41ae3e8f1ce46d7ad7e
2018-09-10 14:46:52 -07:00
Colin Cross
33b1f72b54 Merge "Revert "Add soong_cc_prebuilt.mk""
am: be2ae162f7

Change-Id: I9c4b628d74f70c59a61ef52ac402f5366d642db2
2018-09-10 14:44:03 -07:00
Colin Cross
5763fd7645 Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION
targetSdkVersion should stay as "current" when LOCAL_MIN_SDK_VERSION
is set but LOCAL_SDK_VERSION is not.

Bug: 112438448
Test: atest CtsTelecomTestCases
Change-Id: I72a2dc1073013863f5f8c44f271eace2a4e37a23
2018-09-10 14:41:37 -07:00
Colin Cross
fedcf86936 Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest
full_android_manifest may or may not be equal to
fixed_android_manifest, set PRIVATE_MIN_SDK_VERSION on
fixed_android_manifest instead.

Test: m checkbuild
Change-Id: I21795317a1334ebed772e781aeefba87392a8478
2018-09-10 14:41:37 -07:00
android-build-team Robot
314f8a5d16 Make change and version bump to PQ1A.181101.001
Change-Id: I53c56b24f920207fa9373e7cc6db67bdb6912307
2018-09-10 21:36:48 +00:00
Elisa Pascual Trevino
3e587b55b9 Update platform security string to 2018-11-01 on pi-dev & master
Bug:114110585
(cherry picked from commit 2e6c06ba1b)

Change-Id: Ic1e2d648daa0c28d7d203e44fd6bbe0f705e4eab
2018-09-10 21:36:39 +00:00
Colin Cross
be2ae162f7 Merge "Revert "Add soong_cc_prebuilt.mk"" 2018-09-10 21:36:38 +00:00
Colin Cross
635733b816 Revert "Add soong_cc_prebuilt.mk"
This reverts commit 1bb943b97c.

Reason for revert: broke mac builds
Bug: 113936524

Change-Id: I5b3d8eb1314eb322a5f9c578623ac89e2ad25706
2018-09-10 21:35:55 +00:00
Colin Cross
4f454c43da Merge changes from topics "make_strip_sh", "soong_cc_prebuilt"
am: 78104cdd94

Change-Id: I8f270e87b8ef5369453d17e4d7780e2f6f985eeb
2018-09-10 12:46:46 -07:00
Colin Cross
79f7e5e20e Add soong_cc_prebuilt.mk
am: 1bb943b97c

Change-Id: Ifb47b7dcd755b28eb5849766c77e70ed033463fe
2018-09-10 12:45:54 -07:00
Colin Cross
830eed81ab Use build/soong/scripts/strip.sh for Make modules
Replace the complicated rules in Make with calls the same strip.sh
script that Soong uses.

Bug: 113936524
Test: m checkbuild
Change-Id: If7beeb8381b5a9bc6e9ba15d443a834eb43fc0d4
2018-09-10 11:05:32 -07:00
Colin Cross
1bb943b97c Add soong_cc_prebuilt.mk
Add soong_cc_prebuilt.mk for Soong modules to use so they can avoid
going through all of prebuilt_internal.mk, dynamic_binary.mk and
binary.mk.  Also moves stripping support into Soong.

Bug: 113936524
Test: m checkbuild
Change-Id: I8b37dda2b449b6b5d48d5b983f43de452f494a1e
2018-09-10 11:04:05 -07:00
Mathew Inwood
ca9374e779 Merge "Support for adding dark greylist members from annotations."
am: d72c37eb0a

Change-Id: Id8e6c65b5792257143b5dd70e89107a4d77dd1ce
2018-09-10 02:35:45 -07:00
Mathew Inwood
d72c37eb0a Merge "Support for adding dark greylist members from annotations." 2018-09-10 08:25:46 +00:00
Tianjie Xu
ba293e8da2 Merge "Use the new executable for mkuserimg_mke2fs"
am: 860f9d11a8

Change-Id: I96059ac4804f84feea1b72e3ff42710301c7286d
2018-09-07 20:57:12 -07:00
Treehugger Robot
860f9d11a8 Merge "Use the new executable for mkuserimg_mke2fs" 2018-09-08 03:50:32 +00:00
Evgenii Stepanov
2786d80c64 Merge "(make) Add -fsanitize= argument to assembly flags."
am: 9dcc1d04fb

Change-Id: I72221b69a22fecf1769b001dc9065b5687de50d2
2018-09-07 10:41:23 -07:00
Treehugger Robot
9dcc1d04fb Merge "(make) Add -fsanitize= argument to assembly flags." 2018-09-07 17:23:41 +00:00
Mathew Inwood
edb1c84f03 Support for adding dark greylist members from annotations.
Currently, we support maxTargetSdk values of 26 & 28, corresponding to
the P blacklist (existing dark grey list) and upcoming Q blacklist.

For now, just put the two into the same list, as the runtime support to
distinguish between the two does not exist yet.

Bug: 114361293
Test: m
Change-Id: I2f8d206e8dd22afc6c0e98fb5e53b1d78a534125
2018-09-07 16:52:16 +01:00
David Brazdil
d2d5dede0b Merge "Add hidden API public/private list to KATI_RESTAT"
am: 5ec2688d71

Change-Id: Ie4e5faf3a1533286507c9ec1f1d0b5f753ebc15f
2018-09-07 03:01:56 -07:00
David Brazdil
5ec2688d71 Merge "Add hidden API public/private list to KATI_RESTAT" 2018-09-07 09:31:37 +00:00
yangbill
92ea6769da Merge "ATest: Change module_name from list to single string."
am: adee0d54d0

Change-Id: I5d51e26ae7231ce3b6109da214304a0336dd347c
2018-09-07 00:15:22 -07:00
Treehugger Robot
adee0d54d0 Merge "ATest: Change module_name from list to single string." 2018-09-07 07:07:13 +00:00
Dan Willemsen
408391d205 Merge "Remove GCC support from Make"
am: 5a3ddef8da

Change-Id: I087fdbd4f532c6e92bfbdaa4c0f2374d17d6de23
2018-09-06 19:58:01 -07:00
Colin Cross
6cf56727ea Merge "Use vendor variants of Soong header libraries for vendor modules"
am: 1a9bb089c2

Change-Id: I6c765ad038e403aadb0023dba3ce2c3c7158546e
2018-09-06 19:54:24 -07:00
Treehugger Robot
5a3ddef8da Merge "Remove GCC support from Make" 2018-09-07 02:42:27 +00:00
android-build-team Robot
95212e4410 Version bump to PQ1A.180829.006
Change-Id: I6f759740d8a7759f3437efcbc3837271961a1463
2018-09-07 01:09:34 +00:00
Tao Bao
744c4c7604 Support building chained VBMeta images.
Bug: 112007947
Test: `m dist` with aosp_taimen-userdebug.
Test: Set up a target that uses chained VBMeta images of
      `vbmeta_mainline` and `vbmeta_vendor`. `m dist` and check the
      build log, as well as outputs from
      `avbtool info_image --image vbmeta.img`,
      `avbtool info_image --image vbmeta_mainline.img`,
      `avbtool info_image --image vbmeta_vendor.img`.
Change-Id: Ib1d4e97f583b65245703eae15d211adcd9e83741
2018-09-06 16:55:51 -07:00
Colin Cross
c47911812d Use vendor variants of Soong header libraries for vendor modules
Mark Soong header libraries with vendor variants as SPLIT_VENDOR
so that Make will use the vendor variant for vendor modules.

Bug: 114238698
Test: m checkbuild
Change-Id: I912ab9f4e19d73a1213d60b9795ee30ca87ef614
2018-09-06 16:25:02 -07:00
Dan Willemsen
f063839de9 Remove GCC support from Make
Test: out/build-aosp_arm64.ninja is the same before/after
Test: build_test on downstream branches
Change-Id: If7f8c12f2f288b1e589689361f9457acae634882
2018-09-06 15:40:00 -07:00
David Brazdil
e3fb5f6d09 Add hidden API public/private list to KATI_RESTAT
Change hidden API public/private list generation build rule so that it
checks if outputs have changed and only commit them when changes have
been made. .KATI_RESTAT instructs ninja to restat the outputs and remove
reverse dependencies when rebuilding dependencies is not needed.

Bug: 113278235
Test: m appcompat
Change-Id: Iad23e302b6c30f9a021200acd4bb20e6062de5a2
2018-09-06 18:00:57 +01:00
Tao Bao
5f99923ef1 Expose libminui related variables as vendor default properties.
TARGET_RECOVERY_DEFAULT_ROTATION, TARGET_RECOVERY_OVERSCAN_PERCENT and
TARGET_RECOVERY_PIXEL_FORMAT are vendor-specific properties used by
libminui. So they are needed by both of recovery and charger modes.

We used to pass them to libminui as build-time flags (pre-Q), and
switched them to runtime properties recently (available to recovery
only). Since /sbin/charger lives on system image, the values should be
still passed as runtime properties, but need to be additionally
available under charger mode, and overridable by vendor-init.

This CL writes these variables as vendor default properties (i.e.
/vendor/default.prop if property_overrides_split_enabled is true,
otherwise into /default.prop). Note that writing them as vendor build
properties doesn't work, as init doesn't load /vendor/build.prop under
charger mode.

Bug: 113567255
Test: Build along with other CLs in the topic (for sepolicy and
      libminui changes). Boot into charger mode.
Test: Boot into recovery. Run graphics test.
Change-Id: Iccc4de0fbff508d489fc93b45c2ecfd0fb96053c
2018-09-06 09:25:22 -07:00
Bowgo Tsai
5fe9e99254 Merge "Adding better AVB error message"
am: 71034e3764

Change-Id: I1a401ab3c81b7cd17b3eaa3907317e4a0483736b
2018-09-06 00:55:58 -07:00
Treehugger Robot
71034e3764 Merge "Adding better AVB error message" 2018-09-06 07:45:34 +00:00
Tianjie Xu
07ec2535ce Merge "Add care_map_generator as a dependency of BUILT_TARGET_FILES_PACKAGE"
am: 076662d015

Change-Id: Ic46ad5a7a0e9e7a84e84377bb1df561568bbed77
2018-09-05 23:47:51 -07:00
Treehugger Robot
076662d015 Merge "Add care_map_generator as a dependency of BUILT_TARGET_FILES_PACKAGE" 2018-09-06 06:45:28 +00:00
Tao Bao
e87cf3d0d2 Merge "Map numeric dpi value to density bucket for recovery resources."
am: f2dd520c1c

Change-Id: I2c39a37e32ad040976278a813bb2da5d3ef6c2ba
2018-09-05 22:47:02 -07:00
Tao Bao
f2dd520c1c Merge "Map numeric dpi value to density bucket for recovery resources." 2018-09-06 04:05:27 +00:00
Bowgo Tsai
9d28638cfc Enable AVB signing on GSI
In current GSI builds, AVB signing is not allowed.
We should allow signing GSI image, while building a vbmeta.img with
AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2).

When need to disable AVB, use the vbmeta.img above together with the
GSI. When need enable AVB on GSI, include the GSI public key into the
device-specific vbmeta.img. Note that GSI is a chain partition so the
keys used to sign GSI and vbmeta.img are different.

Bug: 112293933
Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img
      and there is AVB HASHTREE in system.img
      `avbtool info_image --image $OUT/system.img`
      `avbtool info_image --image $OUT/vbmeta.img`

Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
2018-09-06 09:41:42 +08:00
Bowgo Tsai
99ed1b4fbd Adding better AVB error message
Also removing the requirement of BOARD_BOOTIMAGE_PARTITION_SIZE when
BOARD_AVB_ENABLE is set. Some targets (e.g., emulator) doesn't build
boot.img when AVB is enabled.

Bug: 112293933
Test: build a failure case and checks the error output is expected
Change-Id: I290c707719193ddaedcd9fd0b31de566ad17078c
2018-09-06 09:38:45 +08:00
android-build-team Robot
cb30f9d83a Version bump to PQ1A.180829.005
Change-Id: I1db4c1e8b98a1a59a8fcbc11a5806e1f34a62b9b
2018-09-05 23:36:15 +00:00
Tianjie Xu
573322279a Use the new executable for mkuserimg_mke2fs
This is in line with the change of mkuserimg_mke2fs.sh to python binary.

Bug: 112555072
Bug: 63866463
Test: unittests pass
Change-Id: I82c0be1e5bbc685edc15120da73aa43fdc9f2f05
2018-09-05 20:52:47 +00:00
Nan Zhang
56d19ec1d6 Merge "Remove droiddoc.mk from Make!"
am: 48a575c029

Change-Id: I160bb98fc5d9645c0e75fd519fcdefa5b41272df
2018-09-05 11:13:02 -07:00
Treehugger Robot
48a575c029 Merge "Remove droiddoc.mk from Make!" 2018-09-05 17:48:43 +00:00
Tianjie Xu
19174ba4dc Add care_map_generator as a dependency of BUILT_TARGET_FILES_PACKAGE
This solves the missing host executable when calling
add_img_to_target_files.py.

Bug: 113877667
Test: make target-files-package for aosp_sailfish
Change-Id: I133064ef86a1f9c5b4ec6d27345fb49c61a729e5
2018-09-04 15:33:58 -07:00
Evgenii Stepanov
9b82b3fa34 (make) Add -fsanitize= argument to assembly flags.
It allows use of sanitizer preprocessor macros (like __has_feature())
in assembly files.

Bug: 112438058
Test: SANITIZE_TARGET=hwaddress
Change-Id: If9da7493d69fa2e03649754c38117e36eb8d222c
2018-09-04 14:38:38 -07:00
Nan Zhang
2132fbc7a8 Remove droiddoc.mk from Make!
Test: m -j
Bug: b/70351683, b/78245848
Change-Id: I3348461d742c45d5dae105d26a5c3e8680a08029
2018-09-04 10:54:11 -07:00
Narayan Kamath
fb850dc67e Merge "Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23."
am: 0e0ef050f9

Change-Id: I3c909ca434a86ead2a7660f440b585cba50dfd95
2018-09-03 07:28:17 -07:00