Commit Graph

52506 Commits

Author SHA1 Message Date
Roland Levillain
1dbb0c3d1e Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX.
When `OVERRIDE_TARGET_FLATTEN_APEX` is defined (e.g. set in the
environment), `TARGET_FLATTEN_APEX` is forcibly assigned its value.

This is useful to enable/disable APEX flattening from the command
line (thus ignoring the product's default configuration), for testing
purposes.

Note: Previously it was possible to set `TARGET_FLATTEN_APEX` directly
and have the same effect, but recent changes in the build
configuration now prevent that option.

Test: Check that:
        export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && . ./build/envsetup.sh \
          && lunch aosp_walleye-userdebug \
          && export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && build/soong/soong_ui.bash --dumpvar-mode TARGET_FLATTEN_APEX
      returns:
        true
Bug: 121117762

Merged-In: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
Change-Id: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
(cherry picked from commit b3a503df7f)
2020-05-19 02:06:45 +00:00
Paul Scovanner
4a475b4740 Update Security String to 2020-07-01
Bug: 156652977
Change-Id: I81539bf9bd96bdc2e0bca54b506d8a6061f0bfba
2020-05-14 19:56:33 +00:00
Paul Scovanner
a52a320ffd Update Security String to 2020-06-05
Bug: 153882927

Change-Id: I115a68d442f4f3922f0353fae1aae3bf1c057903
2020-04-13 23:40:37 +00:00
Paul Scovanner
388e683934 Update Security String to 2020-06-01
Bug: 153882927

Change-Id: Ibae64bd6c82ddb1afc801550fd7c4ac7bceeb4cc
2020-04-13 18:48:53 +00:00
Paul Scovanner
776c7293fa Update Security String to 2020-05-05
Bug: 151752725
Change-Id: I4393eea75a53f90e23a53020b4a551228564e3cc
2020-03-19 04:40:18 +00:00
Paul Scovanner
db9b1bd6fd Update Security String to 2020-05-01
Bug: 151752725
Change-Id: Ief4b514032bfad1fad1a81c68b4f5e360569f105
2020-03-17 20:47:21 +00:00
Bowgo Tsai
c6f308b8e4 Adding new GSI public keys
Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.

Bug: 149805495
Test: build then checks $OUT/recovery/root/first_stage_ramdisk/avb/.
Change-Id: I69dd00dbb0046c681758068b8bbea0c08b9e2c91
Merged-In: I69dd00dbb0046c681758068b8bbea0c08b9e2c91
(cherry picked from commit 3c739746b3)
2020-02-19 17:42:55 +08:00
Paul Scovanner
d451ad7167 Update Security String to 2020-04-05
Bug:149240442
2020-02-11 00:13:07 +00:00
Paul Scovanner
f9edfe3714 Update Security String to 2020-04-01
Bug:149240442
2020-02-10 21:45:49 +00:00
Automerger Merge Worker
910347f464 Modify build to put dumpcoverage agent into /system/lib am: 3ed9021f87
Change-Id: I4c3fa47783c2cb91ce5c76aeee244a52b880fdf1
2020-02-03 19:14:10 +00:00
Automerger Merge Worker
9c2650dc93 Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled. am: a21e8527a5
Change-Id: I0c44beef80495c15acedda31118db7ba044e2a01
2020-02-03 19:13:58 +00:00
Automerger Merge Worker
0099f3255c Package coverage files as a zip. am: 71640a3296
Change-Id: Id15587fbb0a543c66cbc5f36e58533a6a939e0fc
2020-02-03 19:13:16 +00:00
Kavi Gupta
3ed9021f87 Modify build to put dumpcoverage agent into /system/lib
This location allows the agent to be attached to arbitrary processes.

It only makes sense to include libdumpcoverage.so on coverage builds,
as these are the only builds that have any information to be dumped.

Bug: 148178774
Test: manual, used examples in README (see other CL) to test whether
it works on a userdebug_coverage build on cuttlefish

Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
Merged-In: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
(cherry picked from commit 7185f8cc2d)
2020-02-03 19:07:26 +00:00
Pirama Arumuga Nainar
a21e8527a5 Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled.
libprofile-extras has a wrapper to getenv() that appends the effective
userid (euid) of the current process to GCOV_PREFIX.  This avoids
conflicts and permissions issues when multiple processes try to
create/access the same directories and files under /data/misc/trace.

This library needs to be added and the -Wl,--wrap,getenv flag needs to
be passed to all link steps.  Since Android.mk does not propagate flags
and libraries across dependencies, this change just adds the library and
flag to all non-static-library Android.mk modules.  As a consequence,
*ALL* binaries created via Android.mk will have the signal handler and
property watcher thread in libprofile-extras but they are no-ops in
non-coverage-enabled binaries.

The dependency is added early enough in core/binary.mk so that the
LOCAL_SOONG_LINK_TYPE resolutions occur correctly.

Bug: 148178774
Test: Verify that coverage files are written to
/data/misc/trace/<euid>/proc/... instead of /data/misc/trace/proc/...

Change-Id: I4d5f849c15e9a278253f2148185ddf3ab2878e2f
Merged-In: I4d5f849c15e9a278253f2148185ddf3ab2878e2f
(cherry picked from commit b8f898ef88)
2020-02-03 19:03:24 +00:00
Oliver Nguyen
71640a3296 Package coverage files as a zip.
Bug: 148178774
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae
Merged-In: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae
(cherry picked from commit e91ab2397f)
2020-02-03 19:00:36 +00:00
Paul Scovanner
20c6e7dbe1 Update Security String to 2020-03-05
Bug:147450082
2020-01-10 23:13:40 +00:00
Paul Scovanner
436b42a079 Update Security String to 2020-03-01
Bug:147450082
2020-01-10 19:30:07 +00:00
Huihong Luo
dd82625f27 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev 2019-12-20 00:29:14 +00:00
Lubo Hristov
ef94d3e0aa Merge "Update Security String to 2020-02-05 bug:146378789" into qt-qpr1-dev 2019-12-18 08:13:45 +00:00
Lubo Hristov
9b687f04ca Update Security String to 2020-02-05
bug:146378789
2019-12-18 05:34:05 +00:00
TreeHugger Robot
1c4a406f2c Merge "Adding developer_gsi_keys.mk" into qt-qpr1-dev 2019-12-18 00:31:04 +00:00
Lubo Hristov
82e8e79390 Update Security String to 2020-02-01 bug:146378789 2019-12-16 16:05:44 -08:00
Bowgo Tsai
851f144d90 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
Merged-In: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
(cherry picked from commit 01c6f6f215)
2019-12-16 14:49:42 +08:00
Jerome Gaillard
e5ab595059 Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9
am: 8be676d24a

Change-Id: Ifd141dd407eadacc4bcc6b5002b7d66da8d3d6d5
2019-11-19 04:29:16 -08:00
Jerome Gaillard
8be676d24a Allow files generated by droidstubs to be copied in the SDK
am: 7aa3039ef9

Change-Id: Ief97856b0633e4100856f9e507755b15cef8c4d3
2019-11-19 04:25:39 -08:00
Jerome Gaillard
7aa3039ef9 Allow files generated by droidstubs to be copied in the SDK
We need to get files generated by a droidstubs target into the SDK. So
we first copy them into the out/target/common/obj/PACKAGING folder where
they can be picked up by the SDK build.

Bug: 142480924
Test: m sdk
Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
Merged-In: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-11-18 10:38:13 +00:00
Lubo Hristov
12489ad00b Set SPL to 2020-01-05
bug:144373594
2019-11-15 17:22:42 +00:00
Lubo Hristov
07e7d6b643 Set SPL to 2020-01-01
bug:144373594
2019-11-14 05:14:40 +00:00
huans
874d35bc29 Add Multidisplay App and so to whitelist
Add Multidisplay App to top makefile for sdk_phone

Bug: 114842496 131702523

Test: Build
Change-Id: If1958d2d9e4783438b2fd7cf04de02e64c710564
(cherry picked from commit ff37e043f2)
Merged-In: If1958d2d9e4783438b2fd7cf04de02e64c710564
2019-11-11 19:57:41 +00:00
Raman Tenneti
3fa302e04f Delete AOSP/Email app.
BUG: 139497239

Test: Manual
$ make -j 40

Change-Id: I2a32694b899bc4f0a0ba36b152c06689427dabf4
Merged-In: I2a32694b899bc4f0a0ba36b152c06689427dabf4
2019-10-31 21:08:03 +00:00
Baligh Uddin
0bc382e4a7 Add aapt2 to otatools.zip
Change-Id: I512fcff080b913170f5b1ff84053d31ca4735fa7
Merged-In: Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053
2019-10-30 14:26:43 -07:00
Evgenii Stepanov
69b3f82249 Revert "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds."
This reverts commit edfd1ae712.

Reason for revert: breaks sepolicy_freeze_test

Change-Id: Idf15bfd4bf74cd0ba0ae42c4c95c4afa0c94be54
2019-10-25 03:57:56 +00:00
Evgenii Stepanov
edfd1ae712 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Bug: 142681453
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build

Change-Id: If2eb99dee93f0652cada5cb2e02fda963d00a7eb
Merged-In: If2eb99dee93f0652cada5cb2e02fda963d00a7eb
(cherry picked from commit eb3ade924b)
2019-10-24 21:03:02 +00:00
Lubo Hristov
7c27fd1e00 Merge "Bump SPL to 2019-12-05" into qt-qpr1-dev 2019-10-23 23:02:17 +00:00
Adam Seaton
ad3c37bdce Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev am: 5d0a024d7b
am: 479c9c549b

Change-Id: Ie280a751662d2213b530f64ac40253af28960844
2019-10-16 11:24:30 -07:00
Adam Seaton
479c9c549b Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev
am: 5d0a024d7b

Change-Id: I4cab91199cbd9bef8c44ff2570558f18d99afaaa
2019-10-16 11:18:30 -07:00
TreeHugger Robot
5d0a024d7b Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev 2019-10-16 17:58:38 +00:00
Lubo Hristov
b2945148d4 Bump SPL to 2019-12-05
bug:141626492
2019-10-13 19:38:43 +00:00
Lubo Hristov
c9eed65219 Update SPL to 2019-11-05 am: 73aa913b77
am: b7f65383e2

Change-Id: I29b95c8541dc4bdb028000059dcea285dfa8c42c
2019-09-20 17:14:54 -07:00
Lubo Hristov
b7f65383e2 Update SPL to 2019-11-05
am: 73aa913b77

Change-Id: Iacfdeafb26342ff6a3f203a97dbcab2846b74ae3
2019-09-20 17:08:34 -07:00
Adam Seaton
3b5bdbb68d Update OWNERS for version_defaults.mk with pscovanner & lubomir
Bug: 141272605
2019-09-20 21:51:11 +00:00
Lubo Hristov
7aad3af2d4 Update SPL to 2019-11-01 am: 89b18c02ae
am: 43753d19c9

Change-Id: I260fac0835ca06db5153e80ca582504ec08091cd
2019-09-20 14:17:58 -07:00
Lubo Hristov
43753d19c9 Update SPL to 2019-11-01
am: 89b18c02ae

Change-Id: I0419b0877fdf1d53cf9d3dff4200dac2d4e1397b
2019-09-20 14:12:10 -07:00
Lubo Hristov
73aa913b77 Update SPL to 2019-11-05
bug:141272605
2019-09-20 21:00:52 +00:00
dianlujitao
b6ddb932ca fs_config: Fix generation for devices without vendor partition
If the "--all-partitions" argument is empty, the system fs_config should
be generated with all partitions emitted.

Bug: 140578676
Test: build with only a system partition and check fs_config result
Fixes: 8453f02c (fs_config: Fix cases without vendor/oem partition)
Change-Id: I058cfd1c8e665b40757998e773c35e26465bf58a
Signed-off-by: dianlujitao <dianlujitao@lineageos.org>
(cherry picked from commit 5dcbe701cf)
2019-09-19 16:23:16 -07:00
Felix
5417105d0f fs_config: Fix cases without vendor/oem partition
If the device has neither an OEM nor a vendor partiton,
$PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail
because the "--all-partitions" argument will be empty.

Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be
empty - to appease argparse, which will then populate "_all_partitions"
with an empty "str" object.

Checking _all_partitions against None is superfluous since either
argparse will catch the empty argument and fail early, or the argument
will be a string, in which case it will not be None.

Bug: 140578676
Test: build only a system partition
Signed-off-by: Felix <google@ix5.org>
Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
(cherry picked from commit 8453f02c65)
2019-09-19 16:22:22 -07:00
Lubo Hristov
89b18c02ae Update SPL to 2019-11-01
bug:141272605
2019-09-19 19:54:07 +00:00
Tao Bao
180275bcd5 releasetools: Remove more images out of secondary payload.
This CL additionally removes boot/dtbo/modem/vbmeta_* images out of
secondary payload. We essentially only keep system_other.img and
bootloader images there.

For Pixel devices, this additionally saves ~80MiB (mostly because of
the removal of boot and radio images).

Bug: 140771390
Test: ota_from_target_files \
          --include_secondary --skip_postinstall \
          -i input-target_files-1.zip \
          input-target_files-2.zip \
          output-ota.zip
Test: python -m unittest test_ota_from_target_files
Change-Id: If47b27c52b3547a4cc86223a988c53960bc6af40
Merged-In: If47b27c52b3547a4cc86223a988c53960bc6af40
(cherry picked from commit 3e759462d9)
2019-09-18 10:44:09 -07:00
Tianjie Xu
028a161162 Remove vendor & product in secondary payload
We used to carry the full OTA for vendor and product partitions when
generating the secondary payload. Since they are not actually used, we
can remove them to reduce the size of factory OTA packages. For example,
the size for a sargo package reduces from 454M to 283M after the change.

Bug: 140771390
Test: generate and apply a second payload on Pixel
Change-Id: I091dc07db8c345b182d9f5dd8d48f5c209245641
Merged-In: I091dc07db8c345b182d9f5dd8d48f5c209245641
(cherry picked from commit 1c8080098a)
2019-09-12 23:24:01 +00:00
Baligh Uddin
fd39c26b39 DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f518748b2b

Change-Id: I349111540e765af64cdd0f915819e2a290c01ea1
2019-08-27 00:34:56 -07:00