Commit Graph

44834 Commits

Author SHA1 Message Date
Weilun Du
f7b84c7b84 Merge "Do not copy userdata.img into sdk_addon/system-image.zip" into pi-dev
am: fcf60d8f8a

Change-Id: Icd427c34e1f315dadbedee2c73b26e8f4723305c
2018-05-31 23:22:09 -07:00
Inseob Kim
da9df008e7 [automerger skipped] Merge "Install product shared libraries in /product/lib" into pi-dev
am: 2b7b307a4b  -s ours

Change-Id: Ib83554ef0774f01be5ab9a548c6a4b8effa02f38
2018-05-31 23:13:37 -07:00
TreeHugger Robot
fcf60d8f8a Merge "Do not copy userdata.img into sdk_addon/system-image.zip" into pi-dev 2018-06-01 05:01:50 +00:00
Inseob Kim
756eccde79 [automerger skipped] Install product shared libraries in /product/lib
am: 8b48f56e87  -s ours

Change-Id: I7f551b169eee45439196006e0bb78c6ebff7629e
2018-05-31 20:14:46 -07:00
Yifan Hong
a2a190dd9d Merge "androidboot.lrap => logical_partitions" am: a873417a23
am: 5fae822fa3

Change-Id: I8b2b430f70afc3385603a888cd0326a3b3928843
2018-05-31 18:12:53 -07:00
TreeHugger Robot
2b7b307a4b Merge "Install product shared libraries in /product/lib" into pi-dev 2018-06-01 01:00:28 +00:00
Yifan Hong
5fae822fa3 Merge "androidboot.lrap => logical_partitions"
am: a873417a23

Change-Id: I065e965d1d6a15c31dbe7d1b946f009b3b501ac4
2018-05-31 17:18:12 -07:00
Yifan Hong
a873417a23 Merge "androidboot.lrap => logical_partitions" 2018-05-31 22:05:06 +00:00
Yifan Hong
dfaa860073 androidboot.lrap => logical_partitions
Test: boots with prototype
Bug: 79885414
Change-Id: I63c4d7a4b69d84809700cc71eee8ece33c365e9e
2018-05-31 13:08:11 -07:00
David Brazdil
99c5e72bba [automerger skipped] Merge "Add new file name constant for public DEX API file" into pi-dev
am: 68ca409c5c  -s ours

Change-Id: I45c3270df8e1036ed3edbe066185029be9663a10
2018-05-31 10:36:48 -07:00
David Brazdil
68ca409c5c Merge "Add new file name constant for public DEX API file" into pi-dev 2018-05-31 12:20:57 +00:00
Inseob Kim
8b48f56e87 Install product shared libraries in /product/lib
This is to support /product/lib. Shared libraries with
LOCAL_PRODUCT_MODULE := true or product_specific: true has been
installed in /system/lib. They are now installed in /product/lib.

Bug: 73095206
Test: build succeeded && product libraries are installed under
/product/lib

Change-Id: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498
Merged-In: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498
(cherry picked from commit 47c13524aa)
2018-05-31 09:57:22 +09:00
Andrew Hsieh
93890e73b7 Merge "Build VNDK snapshot for products aosp_[arm|x86]" into pi-dev
am: c99e68684c

Change-Id: Ifca399f035a1cf3b71e406078c2cf8c497c90407
2018-05-30 14:27:20 -07:00
Andrew Hsieh
c99e68684c Merge "Build VNDK snapshot for products aosp_[arm|x86]" into pi-dev 2018-05-30 21:17:48 +00:00
SzuWei Lin
494d2fe97b Enable metadata in GSI
am: 5d356e2397

Change-Id: I2086d56e42b2318a8080d16f13d48c9ee4a23bf1
2018-05-30 11:05:42 -07:00
David Brazdil
12fe6f01e3 Add new file name constant for public DEX API file
We need to generate a new file from Doclava. Create a global variable
for the file name.

Bug: 64382372
Bug: 80461842
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Id850327c29bc626d3d721935edcb2b7afd2fd283
Change-Id: Icd0de1361879b896fd9d3881e405def98c012f0c
2018-05-30 14:13:14 +01:00
Jae Shin
3ba44eb916 Build VNDK snapshot for products aosp_[arm|x86]
P VNDK snapshot needs to include VNDK libs built for 64-bit binder
products, aosp_arm and aosp_x86. This change modifies the following:

1) Revise VNDK snapshot zip file name to use $TARGET_PRODUCT instead of
$TARGET_ARCH in order to distinguish aosp_arm and aosp_arm_ab.
2) Place 32-bit binder libs under a subdirectory 'binder32' such that
the snapshots can be uploaded to prebuilts/vndk/v{VER} with the following
directory structure:

  prebuilts/vndk/v{VER}/
    arm/
      arch-arm-armv7-a-neon/
        shared/
          ...
      binder32/
        arch-arm-armv7-a-neon/
          shared/
            ...
      ...
    arm64/
      arch-arm-armv7-a-neon/
      arch-arm64-armv8-a/
      ...
    ...

The 32-bit binder libs will be placed in a separate subdirectory so that
they can be easily phased out in future VNDK snapshots.

Bug: 80372796
Test: make -j vndk dist
Change-Id: I7cde2e706e0c2891bab762b9057672f57e798873
2018-05-30 21:23:57 +09:00
SzuWei Lin
5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Tao Bao
68dd56a094 [automerger skipped] Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." into pi-dev
am: 221be663d1  -s ours

Change-Id: I090b08d01a43c205aac911e819ad9f7a529997fc
2018-05-29 22:05:44 -07:00
Tao Bao
221be663d1 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." into pi-dev 2018-05-30 05:02:33 +00:00
Dan Willemsen
0e79eb5e2d Merge "Fix OWNERS on version_defaults.mk" into pi-dev
am: d16a9fef12

Change-Id: I4879afb527752241a6ff31afcbd1359596336d43
2018-05-29 21:06:33 -07:00
TreeHugger Robot
d16a9fef12 Merge "Fix OWNERS on version_defaults.mk" into pi-dev 2018-05-30 02:30:38 +00:00
Vishwath Mohan
7bfd882a23 Apply CFI include paths to all product configs.
am: f8d4dc5787

Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
2018-05-29 16:36:09 -07:00
Tao Bao
48bbb1ba67 Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.
We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
      on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
Merged-In: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
(cherry picked from commit 717d9d3ae2)
2018-05-29 15:34:08 -07:00
Dan Willemsen
4d0694a3c8 Fix OWNERS on version_defaults.mk
Bug: 80311893
Change-Id: I904ed66ebe3d09c7d66dd3f845d9e049b15da192
2018-05-29 22:31:24 +00:00
Weilun Du
d61ff0f5e2 Do not copy userdata.img into sdk_addon/system-image.zip
userdata.img becomes 4GB in P and it doesn't work well with patcher in
android studio. We decided to remove userdata.img in system image zip
and generate userdata.img by emulator.
This cl does not impact real devices.

BUG: 79925096

Change-Id: I5406b28291f140e2ebdbcd7c6f684f60ac59b62b
Signed-off-by: Weilun Du <wdu@google.com>
2018-05-29 22:24:29 +00:00
Tao Bao
d4328a80b8 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." am: d48f2a1408
am: cec4c5dfc5

Change-Id: Ib40d8c0fa4a289cf2029b477b9a9469550bd5ae7
2018-05-29 14:20:57 -07:00
Tao Bao
cec4c5dfc5 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP."
am: d48f2a1408

Change-Id: I27859c132199acdd6b82ca5fee13f1b7cddd865f
2018-05-29 14:17:19 -07:00
Tao Bao
d48f2a1408 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." 2018-05-29 21:07:18 +00:00
Yifan Hong
f56d5a9d92 Merge "Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS." am: f346fd4485
am: 63df69d1d5

Change-Id: I37d5fa8a283b214f1a79e329db96c8a7fe9e6195
2018-05-29 13:18:42 -07:00
Yifan Hong
63df69d1d5 Merge "Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS."
am: f346fd4485

Change-Id: I24a729ae27b80f78383e8663b0d393591c383e17
2018-05-29 13:13:34 -07:00
Yifan Hong
b64f5b5145 Merge "Add ro.boot.logical_partitions" am: 78f3983e98
am: 6d3dbb927e

Change-Id: I9bd5760ffbb5e9dd76ae6376a23057504719046f
2018-05-29 13:07:30 -07:00
Treehugger Robot
f346fd4485 Merge "Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS." 2018-05-29 20:02:35 +00:00
Yifan Hong
6d3dbb927e Merge "Add ro.boot.logical_partitions"
am: 78f3983e98

Change-Id: I6284676fe3c711a3cfa41f45aef6a107dbc69ca1
2018-05-29 13:00:31 -07:00
Treehugger Robot
78f3983e98 Merge "Add ro.boot.logical_partitions" 2018-05-29 19:52:14 +00:00
Tao Bao
717d9d3ae2 Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.
We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
      on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
2018-05-29 11:45:09 -07:00
Yifan Hong
ebba19759d Add ro.boot.logical_partitions
Test: boot and getprop
Bug: 79885414
Change-Id: I2c1468a7a625deda8887106c3a087204a1ee8353
2018-05-29 11:17:45 -07:00
Yifan Hong
5cf81a3cfa Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS.
The branch exist for file based OTA, but it is deprecated in O.
Test: m dist

Change-Id: I24275b550f89c2541ef8893fdeffc06f5da01f6e
2018-05-29 11:15:28 -07:00
Vishwath Mohan
f8d4dc5787 Apply CFI include paths to all product configs.
The current VNDK ABI snapshot expects that CFI is disabled for
components that either in the include paths (from cfi-common.mk) OR
enabled directly in the makefile/blueprint. However, on non-arm64
architectures, the build system was only disabling CFI for vendor
components in the include paths.

This topic corrects it by (a) removing the include paths check to disable
CFI for vendor variants, and (b) inheriting the CFI include paths in
all product configs to ensure that when we update the ABI we're able
to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS.

Bug: 66301104
Test: ABI matches for all architectures.
Change-Id: I4d845cd9925354d565e06020c479cc3f7ab28f61
2018-05-28 13:51:05 -07:00
Sundong Ahn
3d64287af0 Merge "Add support when LOCAL_PRIVATE_PLATFORM_APIS is true." am: 24fff76404
am: 211d44d298

Change-Id: I5f8414b5ba6e66c13daae5f64459a83e4b8e3158
2018-05-27 19:46:33 -07:00
Sundong Ahn
211d44d298 Merge "Add support when LOCAL_PRIVATE_PLATFORM_APIS is true."
am: 24fff76404

Change-Id: I5ad362834d1e68b7fadb27fc52063ed57cae6171
2018-05-27 19:37:25 -07:00
Treehugger Robot
24fff76404 Merge "Add support when LOCAL_PRIVATE_PLATFORM_APIS is true." 2018-05-28 02:23:26 +00:00
Dan Willemsen
c025213c15 Merge "Fix path to flex and bison with SANITIZE_HOST" am: 80ebd01032
am: f82669cc5d

Change-Id: I6f93126962d210e2896592bcd3f4a6f570dfc69f
2018-05-25 18:46:39 -07:00
Dan Willemsen
f82669cc5d Merge "Fix path to flex and bison with SANITIZE_HOST"
am: 80ebd01032

Change-Id: I873bd1f1f5bd44dad16842d276911771b71b0c13
2018-05-25 18:41:23 -07:00
Dan Willemsen
80ebd01032 Merge "Fix path to flex and bison with SANITIZE_HOST" 2018-05-26 01:29:55 +00:00
Dan Willemsen
3de78fdf35 Fix path to flex and bison with SANITIZE_HOST
We don't have sanitized versions of flex and bison currently.

Test: forrest on aosp_x86_64-eng
Change-Id: I536885a715c162e36b69282099784abd16a5300c
2018-05-25 16:13:52 -07:00
Dan Willemsen
5db3299b9c Merge "Use new flex binary" am: 6fe15a380d
am: e3cca7657a

Change-Id: Ie148b4361d3f9b7e0d4b175234c18fdbe34b1949
2018-05-25 16:02:05 -07:00
Dan Willemsen
e3cca7657a Merge "Use new flex binary"
am: 6fe15a380d

Change-Id: I4d7ad17576d471cbf58813dd7935dda63fe66c8a
2018-05-25 15:57:09 -07:00
Treehugger Robot
6fe15a380d Merge "Use new flex binary" 2018-05-25 22:44:35 +00:00
Colin Cross
b17a2ca7b7 Merge changes I9b67fd2a,I761f2d06 am: bcc94297e0
am: 60c80c4323

Change-Id: I6bf68590481fbd9ef6137d8c6747e8eb3f98e1a2
2018-05-25 13:46:03 -07:00