Commit graph

47571 commits

Author SHA1 Message Date
Yifan Hong
f8884e0c8b Merge "Fix size checks for retrofit dynamic partitions."
am: fec2671f00

Change-Id: Icc82d59d2cb39d9cc96fe9e45af9eb756823f1ef
2018-11-20 14:43:39 -08:00
Treehugger Robot
fec2671f00 Merge "Fix size checks for retrofit dynamic partitions." 2018-11-20 22:30:56 +00:00
Anton Hansson
366dd21d79 Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline"
am: 6f2cfd93d8

Change-Id: If734c0b555c74b15bb10906ad590bd882b6542e6
2018-11-20 02:24:21 -08:00
Anton Hansson
6f2cfd93d8 Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline" 2018-11-20 10:05:27 +00:00
Dan Willemsen
14899d1e7f Merge changes from topics "iproute2-soong", "iw-soong"
am: 38d08510f8

Change-Id: I54ac46413bb45454417ea3cc07456cad5639716a
2018-11-19 22:39:19 -08:00
Dan Willemsen
38d08510f8 Merge changes from topics "iproute2-soong", "iw-soong"
* changes:
  Add ss as a previously debug tagged module
  Add iw as a previously debug tagged module
2018-11-20 06:27:16 +00:00
Yifan Hong
723b257b01 Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS."
am: 8bd7918a28

Change-Id: Ie9a77886584e9ccc1ee257878d168e995c71fc5c
2018-11-19 20:23:53 -08:00
Treehugger Robot
8bd7918a28 Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS." 2018-11-20 04:06:53 +00:00
Dan Willemsen
66a468a772 Add ss as a previously debug tagged module
From external/iproute2

Test: check installed files on debug builds
Change-Id: Ie2e1fc927f636602b1285f8b0e62a926d538b150
2018-11-20 03:08:19 +00:00
Dan Willemsen
cf0a2169d0 Add iw as a previously debug tagged module
From external/iw

Test: check installed files on debug builds
Change-Id: Ie1282e88dfee47f958e13fd7ec17163f1178cb22
2018-11-20 03:08:07 +00:00
Yifan Hong
46a4349a22 Merge "Remove androidboot.logical_partitions kernel cmdline"
am: 614e1e806e

Change-Id: I83cd177e0e7112060d3c472137797b8d7b4e7449
2018-11-19 16:44:13 -08:00
Yifan Hong
7416b8d143 Remove PRODUCT_USE_LOGICAL_PARTITIONS.
Use PRODUCT_USE_DYNAMIC_PARTITIONS instead.
Test: boots
Fixes: 119286600

Change-Id: I5c0828eac2b6c579edbb494b150bc586b3b576f1
2018-11-20 00:34:30 +00:00
Treehugger Robot
614e1e806e Merge "Remove androidboot.logical_partitions kernel cmdline" 2018-11-20 00:30:05 +00:00
Yifan Hong
426e029980 Remove androidboot.logical_partitions kernel cmdline
Flag is not used anymore.
Fixes: 119286600
Test: boots

Change-Id: I47370369ccde6d504ea0c936a179c4a325302f8b
2018-11-19 22:38:35 +00:00
Yifan Hong
f39d8af57e Fix size checks for retrofit dynamic partitions.
Now that we have two supers for retrofit devices, modify
the size checks. Only A/B devices launched with dynamic partitions
will get the / 2.

Test: builds
Bug: 116608795
Change-Id: Icdddcc0b3f3be307b3907e1c789933c2ace61867
2018-11-19 14:37:45 -08:00
Haibo Huang
2c9a051d3c Merge "Add cpu variant information to vendor/default.prop"
am: b82b51e0b9

Change-Id: Iafe860fe25a9927510c75ce7b5f530d05a545e33
2018-11-19 13:43:44 -08:00
Treehugger Robot
b82b51e0b9 Merge "Add cpu variant information to vendor/default.prop" 2018-11-19 21:37:32 +00:00
Haibo Huang
ee0531da7a Add cpu variant information to vendor/default.prop
Test: build and check vendor/default.prop
Change-Id: I8d86d58c72118c7dda65e75d09680e20c9428c24
2018-11-19 18:57:36 +00:00
Anton Hansson
e5bd8dcda4 Merge "Sort output in dump-files"
am: c6434d43ec

Change-Id: Ic5309914ad379bdde49885dde65e7a4ceebf3081
2018-11-19 09:53:17 -08:00
Treehugger Robot
c6434d43ec Merge "Sort output in dump-files" 2018-11-19 17:43:00 +00:00
Mark Salyzyn
bff53580b8 Merge "fs_config: fix fs_config_*_system targets"
am: 25d43708c8

Change-Id: I362da596503840e335b00025c57c28ba052bd260
2018-11-19 07:27:03 -08:00
Treehugger Robot
25d43708c8 Merge "fs_config: fix fs_config_*_system targets" 2018-11-19 15:15:33 +00:00
Mark Salyzyn
705b59e155 fs_config: fix fs_config_*_system targets
Content from fs_config designated for other partitions is leaking
into the system fs_config_* files.  Notably /vendor is showing up.

Rule expansion happens late, after all parsing.  This is the same in
make and kati.  build/make/tools/fs_config/Android.mk ends with
fs_config_generate_extra_partition_list :=, so by the time you get to
rule expansion the value is empty.

Added a PRIVATE_PARTITION_LIST variable to record the value of
fs_config_generate_extra_partition-list.

Test: inspect result of ${OUT}/product/*/system/etc/fs_config_files
Bug: 119677224
Bug: 119310326
Change-Id: I968b4936ab2c5d174f164c760820af13434654ca
2018-11-19 07:14:54 -08:00
Anton Hansson
41b53a3c19 Sort output in dump-files
Makes it less frustrating to use.

Test: m dump-files
Change-Id: I84801f37e2e40a37d65d3f9ce7b19a84f3381a53
2018-11-19 14:33:19 +00:00
Dan Willemsen
f89d943716 Merge changes from topic "iputils-soong"
am: 7320a023ea

Change-Id: Iecac439885c0efd611051c4e9d123fad797f9fb2
2018-11-18 16:44:30 -08:00
Treehugger Robot
7320a023ea Merge changes from topic "iputils-soong"
* changes:
  Add previously debug tagged modules
  Add sanitizer-status to PRODUCT_PACKAGES_DEBUG
2018-11-19 00:32:44 +00:00
Dan Willemsen
0d78e19721 Add previously debug tagged modules
From external/iputils

Test: check installed files on userdebug builds
Change-Id: I26e7cfa03f8a788283bce9c75fc38b4221cd57e6
2018-11-17 11:38:28 -08:00
Zach Riggle
0665927c9c Add sanitizer-status to PRODUCT_PACKAGES_DEBUG
This ensures all -userdebug builds have the sanitizer-status binary,
which is used to check which build flags were used for a given image.

It is important to distinguish between what the build fingerprint
claims, and what is actually available on the phone.

Change-Id: Iac1eabb8c5ed885a057f7a302b1887b7e9c4ccbc
Merged-In: Iac1eabb8c5ed885a057f7a302b1887b7e9c4ccbc
(cherry-picked from 3a26f80cd4)
2018-11-17 11:37:45 -08:00
Dimitry Ivanov
58d4948fca Merge "Enable overrides for shared libraries"
am: d04107683b

Change-Id: I334167a048a2d7b02cc64c6b63ea04a5713d115a
2018-11-17 01:19:51 -08:00
Dimitry Ivanov
d04107683b Merge "Enable overrides for shared libraries" 2018-11-17 09:03:04 +00:00
Anton Hansson
adbafe0a7c Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline
Likely not the final setting we'll settle with for this device,
but brings mainline_system builds closer to the device builds
it's targeting.

Bug: 80410283
Test: build mainline_arm64
Change-Id: Ib672d1a060d0ad6a4e1faa210461bbbbaf6f2bc6
2018-11-16 16:36:50 +00:00
Elliott Hughes
8e42ecb318 Merge "envsetup.sh: say -p for plain, not -ps."
am: 07d639a4fd

Change-Id: I6cc5e5d0c52e7bf26e23710ffb40db379d00e252
2018-11-16 08:35:18 -08:00
Elliott Hughes
07d639a4fd Merge "envsetup.sh: say -p for plain, not -ps." 2018-11-16 16:19:33 +00:00
SzuWei Lin
fc7f09e5bf Merge "Unmount product partition in GSI"
am: e67518fe6d

Change-Id: Ie47fb8644d53485a55303dd55898637b80d60cf7
2018-11-15 21:32:24 -08:00
Treehugger Robot
e67518fe6d Merge "Unmount product partition in GSI" 2018-11-16 05:17:33 +00:00
Tao Bao
65df239dc1 Merge "releasetools: Temporarily disable verifying AVB-signed images."
am: 810965d23c

Change-Id: I6597c0fbac97223fa223fcb590260781d78858fc
2018-11-15 18:17:08 -08:00
Tao Bao
810965d23c Merge "releasetools: Temporarily disable verifying AVB-signed images." 2018-11-16 01:56:05 +00:00
Elliott Hughes
d3e472569a envsetup.sh: say -p for plain, not -ps.
toybox xxd treats -ps as -p -s with a missing argument to -s, rather
than as a bizarre synonym for -p.

Test: manual
Change-Id: Ia576861588a4ddeac9885bce8d718929b74f31b1
2018-11-15 16:32:14 -08:00
Evgenii Stepanov
37bec41be7 Merge "Build ota packages for SANITIZE_TARGET other than "address"."
am: f05ff886b8

Change-Id: I68cc3f99937c24d4ad32e2bf7fd6549e47c9cf42
2018-11-15 14:50:41 -08:00
Evgenii Stepanov
f05ff886b8 Merge "Build ota packages for SANITIZE_TARGET other than "address"." 2018-11-15 22:26:39 +00:00
Tao Bao
9788b4ed31 releasetools: Temporarily disable verifying AVB-signed images.
Bug: 119624011
Test: Run validate_target_files.py on aosp_blueline-target_files.zip.
Change-Id: I0c3a93dd2ec9fe26c62be2ac2cc26780fb9fe1a6
2018-11-15 13:46:56 -08:00
Evgenii Stepanov
5d06f240e3 Build ota packages for SANITIZE_TARGET other than "address".
HWASan OTAs should work fine.

Bug: 119436631
Test: make SANITIZE_TARGET=hwaddress dist
Change-Id: I87c8ca58b924a478679879d09a34c44cd5832470
2018-11-15 11:14:09 -08:00
Neil Fuller
2bb1611d80 Merge "Add the time zone data module to /system"
am: fcdeba0d6d

Change-Id: Id52fd3a318b66b715b71101f70949d92467a5f55
2018-11-15 07:34:11 -08:00
Neil Fuller
fcdeba0d6d Merge "Add the time zone data module to /system" 2018-11-15 15:17:04 +00:00
SzuWei Lin
4999dc047c Unmount product partition in GSI
This is a workaround solution. It let GSI to unmount product
partition when booting. The patch avoid the problem that

- share UID between between system and product partition
- the product partition override the content under /system/product

Bug: 119391482
Test: Boot aosp_arm64-userdebug on a blueline device with Android P
Change-Id: I48808fcc1ca527a23eb1446b97176b08268b500e
2018-11-15 21:06:56 +08:00
Anton Hansson
aa3d22c0d5 Merge "Add libfwdlockengine to mainline_system"
am: 08d4227898

Change-Id: I802aff0fcdbf7f7f270a6f7aa998ed17a6439d4d
2018-11-15 01:13:10 -08:00
Anton Hansson
08d4227898 Merge "Add libfwdlockengine to mainline_system" 2018-11-15 09:01:16 +00:00
Roland Levillain
684f4091be Merge "Revert^2 "Add the Android Runtime APEX module to PRODUCT_PACKAGES.""
am: c47f2beef3

Change-Id: I7df6d84799e648b99ce10441086a293fd691e9cb
2018-11-14 06:38:45 -08:00
Roland Levillain
c47f2beef3 Merge "Revert^2 "Add the Android Runtime APEX module to PRODUCT_PACKAGES."" 2018-11-14 14:22:08 +00:00
Neil Fuller
97d2d0c8b5 Add the time zone data module to /system
This includes the time zone data APEX in the system image
which should flush out any obvious issues.

Bug: 119026403
Test: build / boot taimen
Change-Id: I3d9a8289d8af405a373c94891b482540e59a3571
2018-11-14 13:13:59 +00:00