Commit graph

14104 commits

Author SHA1 Message Date
Colin Cross
c1ca2cfbf4 Merge "Separate java source list generation into its own rule" am: f61712fbf1 am: bf386cafec
am: 1770c0cc2b

Change-Id: I4644762f6094922044c46be94ca5e368736db81a
2017-08-30 20:15:43 +00:00
Colin Cross
bf386cafec Merge "Separate java source list generation into its own rule"
am: f61712fbf1

Change-Id: Ib69127b00bbdaf254dc68a8387b86d7533fde46b
2017-08-30 20:03:41 +00:00
Treehugger Robot
f61712fbf1 Merge "Separate java source list generation into its own rule" 2017-08-30 19:47:11 +00:00
Colin Cross
a0ef70ffeb Merge "Use java variables from soong" am: ae470d419a am: 65990cdfa5
am: 7ac000ab93

Change-Id: I9e89188255fdad31806426eeb3072a9178163bce
2017-08-30 18:54:28 +00:00
Colin Cross
65990cdfa5 Merge "Use java variables from soong"
am: ae470d419a

Change-Id: I9df55763c0dd2a366fa40a07e7d06de7e29feb4c
2017-08-30 18:40:08 +00:00
Colin Cross
dfc45ec337 Separate java source list generation into its own rule
Move the java source list generation step into its own rule.  This
has a couple of advantages.  It consolidates the source list
generation so that it only has to run once for javac, jack, and
jack-check.  It also massively reduces the length of the javac
command line, so that error messages are significantly shorter,
and allows easily rerunning the failing build command because
the file list is still on disk.

The primary disadvantage is that javac error messages no longer
include the list of files passed to javac, but the list is
available earlier in the build long when the file list was written,
and is still available on disk.

Test: m -j javac-check
Change-Id: I9730b352b33a060e08221b61c11c617d23320d67
2017-08-29 16:50:11 -07:00
Mathieu Chartier
6ca93efd0e Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev
am: e7bda08941

Change-Id: I6d2a5f7bfabe793a53b255edab1f15ba1399601f
2017-08-29 23:22:18 +00:00
Mathieu Chartier
e7bda08941 Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev 2017-08-29 23:13:32 +00:00
Colin Cross
2c69277218 Use java variables from soong
Use TARGET_JAVAC and HOST_JAVAC exported from soong.

Test: m -j checkbuild
Merged-In: Ic094174149ea304c0b06ddc023417acf3602d5a3
Change-Id: Ic094174149ea304c0b06ddc023417acf3602d5a3
(cherry picked from commit 204dd14a2c)
2017-08-29 13:02:07 -07:00
Narayan Kamath
bfd42129d3 Merge "dex_preopt: Use the unstripped jar file for generating profiles." into oc-mr1-dev
am: afb81de1f2

Change-Id: I1795eb230b2c3388b5c2daa8a710d6e1c678b418
2017-08-29 08:52:59 +00:00
TreeHugger Robot
afb81de1f2 Merge "dex_preopt: Use the unstripped jar file for generating profiles." into oc-mr1-dev 2017-08-29 08:43:34 +00:00
Mathieu Chartier
418258cee9 Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.

Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.

Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545
Change-Id: I49f2a23337fdd2bc2e628b683d26a0c135b2aabe
2017-08-28 18:40:30 -07:00
Hung-ying Tyan
bc134621d6 Merge "Fix potential build break" into oc-mr1-dev
am: 9d96622be4

Change-Id: I546c4dc1d74917ddfa2b74f8876160ecf4a9956a
2017-08-27 23:56:30 +00:00
TreeHugger Robot
9d96622be4 Merge "Fix potential build break" into oc-mr1-dev 2017-08-27 23:52:27 +00:00
Michael Wright
f6b3316bbe Merge "O MR1 is API 27" into oc-mr1-dev
am: 0ba9648a13

Change-Id: I092105b03769e3b5f7560d12f19ae3b88de95a7c
2017-08-26 02:40:47 +00:00
Hung-ying Tyan
b260f0d557 Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Ied7b32abd7a5fd5456c4cb5ff68a56debe6254b7
(cherry picked from 58c1b0426f)
2017-08-25 23:24:24 +08:00
Bowgo Tsai
90f4777cdd Merge "Support signing custom_images with AVB" am: e09809a32d am: d8c0bb8f61
am: e047421956

Change-Id: I8d22ff2d4a9bd999d99637f61e2dfabd64069978
2017-08-25 08:05:23 +00:00
Bowgo Tsai
d8c0bb8f61 Merge "Support signing custom_images with AVB"
am: e09809a32d

Change-Id: I292276a499f185d6eff84a2996d9b987a5209124
2017-08-25 07:56:01 +00:00
Treehugger Robot
e09809a32d Merge "Support signing custom_images with AVB" 2017-08-25 07:49:37 +00:00
Bowgo Tsai
480dc7c19d Support signing custom_images with AVB
Current AVB signing for custom images is enabled by either of the
following build variables:
  CUSTOM_IMAGE_AVB_HASH_ENABLE := true
  CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true

A previous change to support chain partition replaced avb_signing_args
with avb_key_path and avb_algorithm. This change updates the
corresponding change for custom_images.

To sign a custom_image as a chain partition, it needs:
  CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
  CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
  CUSTOM_IMAGE_AVB_ROLLBACK_INDEX := 1

Note that it doesn't support include metadata of custom images into
vbmeta.img. Because custom_images is designed to build multiple files
(e.g., custom1.img, custom2.img, custom3.img, etc) and a device can only
use/mount one of them. The vbmeta.img needs to be generated per each
combination.

Bug:36701014
Test: sign custom image with AVB HASH descriptor (non-chain)
Test: sign custom image with AVB HASH descriptor as chain partition
Test: sign custom image with AVB HASHTREE descriptor (non-chain)
Test: sign custom image with AVB HASHTREE descriptor as chain partition
Change-Id: I492e2ce768e7caec22228b776b2c13a2d37a5b89
2017-08-25 13:28:57 +08:00
Isaac Chen
6d91469c13 Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51 am: 9f55141c5f
am: 26704591f3

Change-Id: If9bde7eb9afb7ef392b3bfb9fabffd5127b6543f
2017-08-25 02:24:35 +00:00
Isaac Chen
9f55141c5f Merge "Revert "Revert "Build support for 32-bit armv8-a"""
am: 9a888ebb51

Change-Id: I4f0b7b55de9a0b79d9f81f4aaa6c04ebd1e409b1
2017-08-25 02:03:26 +00:00
Isaac Chen
9a888ebb51 Merge "Revert "Revert "Build support for 32-bit armv8-a""" 2017-08-25 01:55:56 +00:00
Zach Riggle
b6bc12e00a Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a75510c am: 98025a15ab
am: 1e9943c392

Change-Id: Iddfb99235b737f440107b51c1eb78d1a429b562a
2017-08-24 19:57:39 +00:00
Zach Riggle
98025a15ab Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
am: 0d2a75510c

Change-Id: Ief93d3abce6191326caa9b0d19e9cd3f89bd8bfa
2017-08-24 19:45:11 +00:00
Zach Riggle
0d2a75510c Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" 2017-08-24 19:26:14 +00:00
Narayan Kamath
bbcdc07d12 dex_preopt: Use the unstripped jar file for generating profiles.
We were previously using LOCAL_BUILT_MODULE, which wouldn't work in the
case that "nostripping" wasn't specified (i.e when we stripped).

The issue is that the built module has its classes.dex entry stripped,
which means that profman can't do anything meaningful with it.

In this change, we use the right set of files for JAVA_LIBRARIES as well
as prebuilt PACKAGES. Fixing apps built from source is a larger task and
has been left for a future change. Depending on ART changes, we might
need to disable stripping for all apps and/or align userdebug and user
builds with each other. This will be tackled separately.

Test: make
Bug: 64896089
Change-Id: I4fd256d187b66763f354cc6001953469c2cd8fbb
2017-08-24 11:31:03 +01:00
Dmitry Shmidt
8a2d761103 Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a am: 2ad98c62e7
am: 31d54cb2f9

Change-Id: I9a23c572fc890882f5573b2a57b3440b536ae74d
2017-08-24 01:34:54 +00:00
Michael Wright
5d8410b60a O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
2017-08-23 18:23:06 -07:00
Dmitry Shmidt
2ad98c62e7 Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
am: 714f406a8a

Change-Id: I93690f777b3bc988731d6f7d26eea0d73462c562
2017-08-24 01:22:51 +00:00
Treehugger Robot
714f406a8a Merge "Set Uml if TARGET_USER_MODE_LINUX is true" 2017-08-24 01:14:36 +00:00
Dmitry Shmidt
82d05aaf13 Set Uml if TARGET_USER_MODE_LINUX is true
Bug: 64985489
Test: Manual

Change-Id: Ic472fadcf64eb04e592b6f14570f7650bcd4f2e9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-08-23 15:53:28 -07:00
Isaac Chen
f5af850a29 Revert "Revert "Build support for 32-bit armv8-a""
This reverts commit 7de79cbeaf.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Narayan Kamath
082d9d7cf5 Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856 am: 3d5dd6e4da
am: 5d8742482d

Change-Id: I6513a92f117a9231c3907bd97ea6f4335b662b6f
2017-08-23 09:59:40 +00:00
Narayan Kamath
5d8742482d Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856
am: 3d5dd6e4da

Change-Id: Ib4fd1006385f5a4c70b3bcff7b9fb66ee753b732
2017-08-23 09:56:09 +00:00
Narayan Kamath
3d5dd6e4da Merge "core: Fix typo in build rule." am: 665015ad17
am: 494e5fe856

Change-Id: I4be385b8cfe6506d6389596f14c545c14e25f87f
2017-08-23 09:52:39 +00:00
Narayan Kamath
665015ad17 Merge "core: Fix typo in build rule." 2017-08-23 09:40:12 +00:00
Dan Willemsen
664484189e Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5 am: 57385f5ff1
am: 377e870b9e

Change-Id: I7d20339c9f6b8203ecc42108f7d38a25c517161f
2017-08-23 02:08:38 +00:00
Dan Willemsen
377e870b9e Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5
am: 57385f5ff1

Change-Id: I44c20a2c3b51b4d33c3a09a192eef51059c543b4
2017-08-23 02:05:08 +00:00
Dan Willemsen
57385f5ff1 Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d
am: f1c8fdede5

Change-Id: I344a2da1e195cadd53710173a14b68323404ca63
2017-08-23 02:02:25 +00:00
Adam Seaton
d8115fb4f9 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0
am: 1b17813951

Change-Id: I9f2545f1f1c54edbaee396dc662111fa9b228769
2017-08-22 22:48:45 +00:00
Adam Seaton
bf413aa70d Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
2017-08-22 22:48:23 +00:00
Adam Seaton
50bd0fa2cc Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4
am: 2174b6e355

Change-Id: If6ccc8963facaa0794f51b67718b7c2770e506e0
2017-08-22 22:48:10 +00:00
Adam Seaton
90b1c82d83 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201

Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
2017-08-22 22:47:53 +00:00
Adam Seaton
1b17813951 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: ca22b203d0

Change-Id: I65b91c3e3acfa25af3792ddb86d9da418daaae8b
2017-08-22 22:41:59 +00:00
Adam Seaton
2174b6e355 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 55b78726b4

Change-Id: I2454bd68b62032987f67cf00aa02f246fa097325
2017-08-22 22:41:28 +00:00
Adam Seaton
f3ae135ddb Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton
ca22b203d0 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: I6b3fcb447c334206889a635178cda68f6bb20131
2017-08-22 22:37:09 +00:00
Adam Seaton
834db8c201 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
Adam Seaton
55b78726b4 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I56396b94ed83855dc0c0f86c99fffa46120b92eb
2017-08-22 22:36:22 +00:00