Commit Graph

16847 Commits

Author SHA1 Message Date
Treehugger Robot
2a801b3cd7 Merge "Call lld with --pack-dyn-relocs=none if my_pack_module_relocations is false" 2018-06-01 20:58:25 +00:00
Dan Willemsen
6f57b2889d Use hermetic strip for atree
Use the newly exposed HOST_STRIP from Soong to strip host tools during
atree.

This appears to produce slightly different host tools, but they're still
stripped.

Test: m PRODUCT-sdk_arm64-sdk dist sdk_repo
Change-Id: Id2863347882eb63d2a4cce45f0cd8de510ed4543
2018-06-01 12:37:01 -07:00
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
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
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
Chih-Hung Hsieh
289e8d6011 Call lld with --pack-dyn-relocs=none if my_pack_module_relocations is false
* Factor out the logic that sets up my_pack_module_relocations
  from dynamic_binary.mk to pack_dyn_relocs_setup.mk.
* Use stand-alone relocation_packer only if my_pack_module_relocations
  is true and my_use_clang_lld is false.

Bug: 80093890
Bug: 73768157
Test: build and boot with USE_CLANG_LLD=true
Change-Id: I7c4b5fcdce0754c57cff4acf86185cac65a26c40
2018-05-31 16:18:22 -07: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
68ca409c5c Merge "Add new file name constant for public DEX API file" into pi-dev 2018-05-31 12:20:57 +00:00
Anton Hansson
061cbcfdae Rename the poorly named ALL_PRODUCTS variable.
There was PRODUCTS, ALL_PRODUCTS and really_all_products, and
ALL_PRODUCTS was in fact not all products. Rename it to what
it really is: parent makefiles, i.e. product makefiles that include
other product makefiles.

Also rename the really_all_products var.

Bug: 80410283
Test: lunch aosp_arm64; m product-graph
Change-Id: I87aec49966e50c364ca2baf5de10fe30f9292a53
2018-05-31 11:03:53 +01:00
Jae Shin
f20605c584 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
Merged-In: I7cde2e706e0c2891bab762b9057672f57e798873
Change-Id: I7cde2e706e0c2891bab762b9057672f57e798873
(cherry picked from commit 3ba44eb916)
2018-05-31 16:51:27 +09: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
Yifan Hong
760d3c0180 generate-image-prop-dictionary only generates relevant variables
Test: m dist
Bug: 79106666
Change-Id: I90555c95a4742fb94b5030e9b3219d783353c603
2018-05-30 14:47:01 -07: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
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
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
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
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
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
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
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
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
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
Treehugger Robot
6fe15a380d Merge "Use new flex binary" 2018-05-25 22:44:35 +00:00
Dan Willemsen
11677ed983 Mark more common variables and paths as readonly
We've had a report of Android.mk files changing one of these paths,
leading to very strange issues. Nobody should be writing to these
variables after they're set.

Bug: 76424357
Test: diff build-aosp_arm.ninja
Change-Id: I66a9740d89feae342af13341ee3a630a20d62b64
2018-05-25 21:45:57 +00:00
Colin Cross
b17a2ca7b7 Merge changes I9b67fd2a,I761f2d06 am: bcc94297e0
am: 60c80c4323

Change-Id: I6bf68590481fbd9ef6137d8c6747e8eb3f98e1a2
2018-05-25 13:46:03 -07:00
Colin Cross
bcc94297e0 Merge changes I9b67fd2a,I761f2d06
* changes:
  Revert "Revert "Use AAPT2 by default""
  Work around incorrect R8 proguard compatibility
2018-05-25 20:30:01 +00:00
Colin Cross
cf5180c198 Work around incorrect R8 proguard compatibility
Proguard treats -dontobfuscate -keepattributes *Annotations* the
same as -dontobufscate by keeping all attributes.  R8, even in
proguard compatibility mode, discards all attributes that don't
match, including EnclosingClass attributes that may be necessary.
Pass -keepattributes * whenever passing -dontobfuscate to make R8
act more like proguard.

This isn't a complete solution, some modules may set
LOCAL_PROGUARD_ENABLED := custom and then manually specify
-dontobfuscate on the command line or in a flags file, in which
case they will see the incorrect behavior of R8.

Bug: 80081393
Test: m checkbuild
Test: examine attributes on com.android.stk.BootCompletedReceiver
      in out/target/common/obj/APPS/Stk_intermediates/classes.dex

Change-Id: I761f2d0617c5295df8fc7adfc4fd00d2aa41961e
2018-05-25 11:34:13 -07:00
Colin Cross
5b89ec4d42 Revert "Revert "Use AAPT2 by default""
This reverts commit 777cf2c450.

Reason for revert: manifest merger is used for libraries forced to aapt2 now

Bug: 79481102
Test: m checkbuild
Change-Id: I9b67fd2a9b3234798b2aac879b5242c2097b3863
2018-05-25 11:34:13 -07:00
Vishwath Mohan
088506c303 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev
am: d002e49501

Change-Id: I32d21f2dbbbaf4bb7f8a6be033d036ab626cba10
2018-05-25 00:24:49 -07:00
TreeHugger Robot
d002e49501 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev 2018-05-25 07:15:45 +00:00
Jiyong Park
fbaf8f7530 Merge "Don't copy system/sbin/adbd to recovery" am: 93ca8d3789
am: b771720b24

Change-Id: I29f78cccc259d6a6d1046578f5576ec12ca5be98
2018-05-24 23:15:31 -07:00
Treehugger Robot
93ca8d3789 Merge "Don't copy system/sbin/adbd to recovery" 2018-05-25 05:58:01 +00:00
Vishwath Mohan
6106a4ead5 Enable CFI by default but restrict CFI_INCLUDE_PATHS
This CL enables CFI on security sensitive components for product
configs that inherit core_64_bit.mk (and core_64_bit_only.mk). Note
that this only requests the build system to do so. Internal build
logic will dictate if this is actually enabled on the build or
not (CFI is currently disabled for ARM32 and MIPS for example).

In addition, this also restricts CFI_INCLUDE_PATHS and
PRODUCT_CFI_INCLUDE_PATHS to Arm64 architectures only. This helps
narrow which targets enable CFI out of the box.

Bug: 66301104
Test: CFI is enabled on aosp_* targets
Change-Id: I52af499dc34cd4b42fbfb1175f6a37aaf17b65dd
2018-05-24 22:14:03 -07:00
Dan Willemsen
6535dd9891 Use new flex binary
Test: treehugger
Change-Id: Iee21114ae863eb50d26ee9562879a97f956274ab
2018-05-24 16:04:58 -07:00
Tao Bao
80731c6764 Merge "Pack additional AVB testkeys into otatools.zip." am: e2d0b0cc43
am: ff01d91499

Change-Id: I69ab7766f939242b8e21dcbe5328df65b1ad3929
2018-05-24 11:23:33 -07:00
Inseob Kim
b494d1286d Merge "Install product shared libraries in /product/lib" am: e56adeffef
am: 53fd2bbb61

Change-Id: Ifdc5c5c3a27be9100309f41b3dca2348f54ad543
2018-05-24 10:45:15 -07:00
Colin Cross
32d7528352 Merge "Add minSdkVersion to default manifests" am: bd842d0b64
am: f3aa016621

Change-Id: I963496e81e5fbbe64d62bb3568ee527801c83bb0
2018-05-24 10:44:35 -07:00
Colin Cross
c45949b4db Merge "Fix missing class in manifest merger" am: 7f706cabac
am: df267c25e9

Change-Id: Iec8c8f60b7dbd59e23b8ef87b646854b2abe47dd
2018-05-24 10:44:00 -07:00
Yifan Hong
03f31c6625 Merge "Add PRODUCT_USE_LOGICAL_PARTITIONS" am: fecdb5db65
am: 725e94ea24

Change-Id: I64fb594c1493e804ec1dff1fe84976b574ff67bb
2018-05-24 10:43:25 -07:00
Colin Cross
42cc0ba39f Merge "Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2" am: 4a49af1ceb
am: 457a80cc39

Change-Id: I63069acfbcf65549d53d48bfe66366ceeff3c133
2018-05-24 10:42:49 -07:00
Tao Bao
ba822a97cd Pack additional AVB testkeys into otatools.zip.
Bug: 71372646
Test: `m -j otatools-package`; Check $OUT/otatools.zip.
Change-Id: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba
Merged-In: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba
(cherry picked from commit 2d0e5124b0)
2018-05-24 10:07:30 -07:00