p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,491 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

38491 Commits

Author SHA1 Message Date
Android Build Merger (Role) 5fdfd05e04 Merge "emulator: get emulator booting am: d665b020f2 am: 0f4de2f8aa" into oc-dr1-dev-plus-aosp 2017-07-06 02:21:03 +00:00
bohu 6c3d307741 emulator: get emulator booting am: d665b020f2 
am: 0f4de2f8aa

Change-Id: I7b953b80ce7ad1cd21d79dfcc0e5df24d1b4376f
 2017-07-06 02:20:36 +00:00
bohu 0b737d3248 emulator: get emulator booting am: d665b020f2 
am: 0f4de2f8aa

Change-Id: I5fcbc47de2c46dbc468139e95a626ad071a2e0a2
 2017-07-06 02:19:53 +00:00
bohu 0f4de2f8aa emulator: get emulator booting 
am: d665b020f2

Change-Id: Idf376eae7d42242f17fdef99ce0d6de9067a2236
 2017-07-06 02:17:22 +00:00
bohu e9ba09af7a emulator: get emulator booting 
am: d665b020f2

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

Change-Id: I43969fc5871a03bb293605e8ac7fc11f6afe878b
 2017-07-06 01:11:14 +00:00
Bowgo Tsai fcca0811ca Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39 am: 95202bcba6 
am: 412138338e  -s ours

Change-Id: Ibc05db84f0678648058f4e6795bf548a8c0376d0
 2017-07-06 01:10:56 +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 337a94b1e1 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" am: 691f5cec3a am: 15a5eba089 
am: ce7c8f0c54

Change-Id: Id4d5883bb255af032665f719918d3f8e618e79d1
 2017-07-05 18:22:03 +00: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 373a13c0ca Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df 
am: d8a22925f5

Change-Id: I8681d9c889018fe656f5ef4cc380d1a3af8c325f
 2017-07-01 01:45:16 +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 cea12fa14d Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 
am: 415024dcba

Change-Id: I5ddfec3ba7bccd028255ae9729b29606ab220cfd
 2017-06-30 16:39:41 +00: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
TreeHugger Robot 415024dcba Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 2017-06-30 16:32:13 +00:00
Bowgo Tsai 9e95beab31 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.
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
 2017-06-30 12:13:15 +08:00
Dimitry Ivanov 181713e34f Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767 
am: b07838c082

Change-Id: I8a5fc05538b48f8ae086e6d25b30633225f8dfc3
 2017-06-29 22:25:07 +00: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 f445e283e2 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d am: dbe39cd069 
am: 213d48e682

Change-Id: Ib4f92789fde658855600ed129e808531a5b54e55
 2017-06-29 19:09:53 +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 47743957f3 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817 am: ce10b6e2f3 
am: 1612f02ff2

Change-Id: If03509584275c1c0fc1f72f44cfb8fbfdfd4125b
 2017-06-29 03:22:35 +00: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 abc7589479 Support replacing AVB signing keys. 
am: c218a470fb

Change-Id: I7f7b1f6d5e4189b310f5eee6c839b56b0ded1887
 2017-06-28 23:01:06 +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 7c58e8f438 Merge "Support replacing AVB signing keys." am: 682849976d am: b5363b2dbc 
am: 118b3243f8

Change-Id: I725f16a05c9005c0a8b0c7753396cd3a1c7f3812
 2017-06-28 19:48:24 +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
Tao Bao 0782db1b0f Merge "Delay the write-back of misc_info in sign_target_files_apks.py." into oc-dr1-dev 
am: 7b8a7936dd

Change-Id: I67bacddbb00ac47124f5ad2bc059a7558847f302
 2017-06-28 19:41:23 +00:00
Tao Bao c218a470fb 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
(cherry picked from commit 639118ff4d)
 2017-06-28 12:38:32 -07:00