Commit Graph

37834 Commits

Author SHA1 Message Date
Dan Willemsen 8533fa1b9d Fix install location for vendor tests
Bug: 63393698
Test: m -j hidl_test_client; apply; m -j hidl_test_client
Change-Id: Ia54a8d2aaedd63ce1d70944ee69fda3b9fe223a9
2017-07-06 17:46:17 -07:00
Bryan Eyler d4794315ff Re-compute DX command if it changes for PDK.
Bug 62360631
Tested build of PDK.

Test: builds
Change-Id: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
Merged-In: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
(cherry picked from commit af4bde4239)
2017-07-06 16:22:01 -07:00
Colin Cross a12d38a721 Increase max heap size for javac to 2GB.
Compiling Dialer requires increasing the javac heap size above
1GB, probably due to the extensive use of annotation processors.
Increase it to 2GB.

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e
Merged-In: I4dd3759a98ea915469e69f563dc49be8a25d518e
(cherry picked from commit 0e785c79b8)
2017-07-06 16:13:00 -07:00
Przemyslaw Szczepaniak 2e81b3c49f Enable stripping of java debug information when required.
We're removing LocalVariableType / LocalVariableType in order to
save space. Enabling stripping reduces AOSP  image size save
by ~12MB.

Bug: 38224820
Test: CtsLibcoreTestCases
Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
2017-07-06 08:31:14 +00:00
Howard Chen 0b2aebab08 Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e
am: fd380f20cb

Change-Id: Id2f55d548088375eaf38f6b809be9e804adaf83b
2017-07-06 03:52:53 +00:00
Howard Chen fd380f20cb Merge "Add a make maco to convert string to upper case"
am: 8eff2d7c8e

Change-Id: I86260216cea1c2a6d46599481e19e0063ae576a8
2017-07-06 03:50:54 +00:00
Howard Chen 8eff2d7c8e Merge "Add a make maco to convert string to upper case" 2017-07-06 03:46:07 +00:00
bohu e9ba09af7a emulator: get emulator booting
am: d665b020f2

Change-Id: I2d2399cca30f02b66dd243086839b35a336050bb
2017-07-06 02:17:22 +00:00
Bowgo Tsai 1c702ee273 Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master
am: fd9315668e  -s ours

Change-Id: Ib25c47f4e4761e861e11027b1e110a5bbb8feec0
2017-07-06 01:01:57 +00:00
Bowgo Tsai 412138338e Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39
am: 95202bcba6

Change-Id: I9b9a5faf158157fbb34d18c4e7107e137411634d
2017-07-06 01:00:41 +00:00
Android Build Merger (Role) fd9315668e Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master 2017-07-06 00:58:34 +00:00
Bowgo Tsai 6138b22d35 Merge "Align size of vbmeta image to 4k boundary"
am: efb6fddf39

Change-Id: I1aac1bdccaa3a08fa86194184797a2875cb5b81c
2017-07-06 00:58:21 +00:00
Bowgo Tsai 95202bcba6 Merge "Align size of vbmeta image to 4k boundary"
am: efb6fddf39

Change-Id: I4ace791408c92f55bc55f2fbf72dfef3ab363a70
2017-07-06 00:58:16 +00:00
Jiyong Park 7f8be9f695 Give TARGET_OUT_HEADERS to vendor modules
Many vendor modules are using headers that are copied to
$(TARGET_OUT_HEADERS)/some/path via LOCAL_COPY_HEADERS. In order to let
them use the headers via #include <some/path/header.h>,
$(TARGET_OUT_HEADERS) is again added to the system include path.

Bug: 63340459
Test: BOARD_VNDK_VERSION=current m -j gives less 'cannot find header'
errors.

Change-Id: I472e74533b437653c76dc416f7f4527c0e90750d
2017-07-06 09:45:26 +09:00
Treehugger Robot efb6fddf39 Merge "Align size of vbmeta image to 4k boundary" 2017-07-06 00:29:52 +00:00
bohu d665b020f2 emulator: get emulator booting
1. add missing hals
2. setup missing selinux
3. install manifest.xml to vendor/
4. install emulator setup scripts and setup
   selinux domain

BUG: 63268696
Test: build sdk_gphone_x86-userdebug
and launch emulator, boot to home

Change-Id: Ibacea9c761bc06736a8baa39d891d1c2ed3d74f4
2017-07-05 17:02:56 -07:00
Andreas Gampe ce7c8f0c54 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" am: 691f5cec3a
am: 15a5eba089

Change-Id: I24d20f5877a9e41b3f74aeb7b94674d01e991fc9
2017-07-05 18:18:35 +00:00
Andreas Gampe 15a5eba089 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD"
am: 691f5cec3a

Change-Id: Ia4ba8aa3ed015eaa149484ed0e644d646806ecec
2017-07-05 18:14:34 +00:00
Treehugger Robot 691f5cec3a Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" 2017-07-05 18:05:36 +00:00
Colin Cross d8a22925f5 Merge "Provide make variables for java binaries" am: 5e19557eb9
am: e885ccf0df

Change-Id: I28f7e020e23c629ef303222c3a8489fc6aa541d6
2017-07-01 01:40:45 +00:00
Colin Cross e885ccf0df Merge "Provide make variables for java binaries"
am: 5e19557eb9

Change-Id: Ib1be7da98214e3b6c27867b80005e18cc68a0d33
2017-07-01 01:36:14 +00:00
Treehugger Robot 5e19557eb9 Merge "Provide make variables for java binaries" 2017-07-01 01:25:10 +00:00
Colin Cross 0851df8c82 Provide make variables for java binaries
Replace java -> $(JAVA), etc. to prepare for moving java binaries
out of the path and using full paths to them.

Test: builds
Bug: 62956999
Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12
2017-07-01 01:03:14 +00:00
Andreas Gampe 831fc713f8 Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
Add product variable that can override the ART module behavior
packing. Rules and meaning are detailed in art/Android.mk.

Bug: 62087184
Test: m
Change-Id: I88e1cb0925cf62c3951b486a178d4dfc5e888a93
2017-06-30 11:37:38 -07:00
Bowgo Tsai 0556231cae Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" in BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS
instead of INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS. The former setting will
be propogated to `make dist` while the latter is only used for `make`.

Bug: 38454093
Test: `make dist` and check vbmeta.img is being padded.
Merged-In: I929288b218761a4637a2a2ef0679d3ff85c70731
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
(cherry picked from commit 9e95beab31)
2017-07-01 00:34:02 +08:00
Dimitry Ivanov b07838c082 Merge "Add libdl.so to the list of system shared libs" am: b519d002f3
am: cd00be0767

Change-Id: I994196c311525799c075476520a386d5fa22e2ed
2017-06-29 22:21:06 +00:00
Tao Bao 3f72176da0 Track the AVB property name change.
system_avb_hashtree_enable has been renamed to
avb_system_hashtree_enable in commit
3e599ead66. 'care_map.txt' is missing due
to the change.

Bug: 63142730
Test: `m dist` and check IMAGES/care_map.txt exists in target_files zip.
Change-Id: I60c269b41df844b50353d357bf67c20f15548642
2017-06-29 15:19:09 -07:00
Dimitry Ivanov cd00be0767 Merge "Add libdl.so to the list of system shared libs"
am: b519d002f3

Change-Id: I2d3d5daf26b7a78d68c02cf961bf43a71f19b0bf
2017-06-29 22:17:04 +00:00
Dimitry Ivanov b519d002f3 Merge "Add libdl.so to the list of system shared libs" 2017-06-29 22:12:03 +00:00
Dan Austin 213d48e682 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d
am: dbe39cd069

Change-Id: I5df5ea78d06479611e963eb6734085cd39dda7dd
2017-06-29 19:05:52 +00:00
Dan Austin dbe39cd069 Merge "Update coverage sanitizer flags in make"
am: 846bd7e00d

Change-Id: If5b06376ddb67ddecce4162ddeeb4828c35fa47f
2017-06-29 19:02:23 +00:00
Treehugger Robot 846bd7e00d Merge "Update coverage sanitizer flags in make" 2017-06-29 18:50:38 +00:00
Dan Austin 9978b5274c Update coverage sanitizer flags in make
Update the coverage sanitizer flags in make to use the new
flavor of coverage sanitization.

Bug: 63108942

Test: Test fuzzer runs with coverage guards.

Change-Id: I12bda1767b69d0d89557e5f8a91da50b0f137ff3
2017-06-29 08:53:02 -07:00
Howard Chen b83b205265 Add a make maco to convert string to upper case
There's already a to-lower function. Add a to-upper function to make
it complete.

Bug:36012197
Test: `make` pass, flash images from $OUT and boot device with chain
partitions

Change-Id: I39fe8c277a3cf6b87fc3c411eeab2fa5fb40007b
2017-06-29 16:18:47 +08:00
Tao Bao 1612f02ff2 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817
am: ce10b6e2f3

Change-Id: I3b6f7ade42f58baa722e2ee3df81efac48a5b653
2017-06-29 03:19:02 +00:00
Tao Bao ce10b6e2f3 Merge "Allow packing custom radio images into target_files zip."
am: 9ea6a8b817

Change-Id: Ifdcdfa2214e4fa75bb0c7a5df1cb1796814fa7bc
2017-06-29 03:16:17 +00:00
Tao Bao 9ea6a8b817 Merge "Allow packing custom radio images into target_files zip." 2017-06-28 22:03:19 +00:00
Tao Bao 118b3243f8 Merge "Support replacing AVB signing keys." am: 682849976d
am: b5363b2dbc

Change-Id: I8388e8c3c3bf801d7a9d50f111e91555b933a4d7
2017-06-28 19:44:54 +00:00
Tao Bao b5363b2dbc Merge "Support replacing AVB signing keys."
am: 682849976d

Change-Id: Iedbd4ce27ffdfeb3d88406f75636221739427add
2017-06-28 19:41:25 +00:00
Treehugger Robot 682849976d Merge "Support replacing AVB signing keys." 2017-06-28 19:36:09 +00:00
TreeHugger Robot 5a7a3aca13 Merge "Move /default.prop to /system/etc/prop.default" into oc-dev-plus-aosp 2017-06-28 06:29:33 +00:00
Dimitry Ivanov cdf3927ec4 Add libdl.so to the list of system shared libs
Note that libdl is already (always) implicitly loaded
because libc.so has a dependency on it.

Also make sure that libc.so always preceding libdl.so
in dt_needed list.

Bug: http://b/62815515
Test: make
Change-Id: I94c9d676b7fa98438b452d24f6c3bbf93166c6a9
2017-06-27 16:05:13 -07:00
Tao Bao 95a95c3a5e Allow packing custom radio images into target_files zip.
Radio images are added to INSTALLED_RADIOIMAGE_TARGET, which by default
will be packed under RADIO/ in a target_files zip. This CL introduces
BOARD_PACK_RADIOIMAGES that allows additionally copying them into
IMAGES/, which will then be included into <product>-img.zip.

Bug: 62195105
Test: Define BOARD_PACK_RADIOIMAGES and `m dist`. Check the generated
      target_files zip and <product>-img.zip.
Change-Id: I3deafd2dfecd1d4dbfdfc2d002fc40ef22fb60ea
2017-06-27 13:50:12 -07:00
Tao Bao 639118ff4d Support replacing AVB signing keys.
sign_target_files_apks.py now supports signing targets using verified
boot 2.0 (aka AVB). It allows replacing AVB signing keys for both of
chained and non-chained partitions.

An example command line looks as follows.
 $ ./build/tools/releasetools/sign_target_files_apks.py \
     --avb_vbmeta_key external/avb/test/data/testkey_rsa2048.pem \
     --avb_vbmeta_algorithm SHA256_RSA2048 \
     --avb_vbmeta_extra_args \
         "--signing_helper_with_files ./signing-helper.sh" \
     --avb_system_key external/avb/test/data/testkey_rsa4096.pem \
     --avb_system_algorithm SHA256_RSA4096 \
     --avb_system_extra_args \
         "--signing_helper_with_files ./signing-helper.sh" \
     product-target_files.eng.zip signed-product-target_files.zip

To verify the signed images:
 $ unzip signed-product-target_files.zip IMAGES/\*
 $ avbtool verify_image --image IMAGES/vbmeta.img \
     --expected_chain_partition system:1:testkey_rsa4096_pub.pem \
     --key external/avb/test/data/testkey_rsa2048.pem

Bug: 38315721
Test: sign_target_files_apks.py on AVB-enabled target w/ and w/o chained
      partitions respectively. Check the signing command lines; validate
      the signed images with 'avbtool verify_image'.
Change-Id: Ia009555b16ddb6d8ba6a0858d5ca7d983bbab887
2017-06-27 10:50:46 -07:00
Hung-ying Tyan 7eb6a926ad Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
(cherry-picked from 4fbbe4578bb10d54292d9b243edf4999fddf1c93)
2017-06-27 15:10:32 +08:00
Tao Bao 6298a8796f Rewrite the prop file at BOOT/RAMDISK/prop.default.
am: e51b671e1e  -s ours

Change-Id: I311a3a486a8e4b08b53afeba3760f6682fcef824
2017-06-27 01:40:42 +00:00
Tao Bao e51b671e1e Rewrite the prop file at BOOT/RAMDISK/prop.default.
This is the new prop filename after commit
a6b68e72b1.

Bug: 63038934
Test: sign_target_files_apks.py with marlin TF.zip.  Check the contents
      in BOOT/RAMDISK/prop.default in signed-TF.zip.
Change-Id: I78106b68c387769bce50804c141c9e14dff55c09
2017-06-26 17:11:36 -07:00
Colin Cross df973cb239 Merge "Get java config from soong" am: bf215d166b
am: 253ffe20e1

Change-Id: I4250672ec7cd18a4f82c3e4019a9ec418a17df11
2017-06-23 21:57:03 +00:00
Colin Cross 253ffe20e1 Merge "Get java config from soong"
am: bf215d166b

Change-Id: I3a5c06e74837baa4174d15c04d25bc61a9aac2d1
2017-06-23 21:48:49 +00:00
Treehugger Robot bf215d166b Merge "Get java config from soong" 2017-06-23 21:40:16 +00:00