Commit Graph

48016 Commits

Author SHA1 Message Date
Colin Cross 39b2705b4b Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong"
am: 9c68021f67

Change-Id: Ibfeec922cee943935097be7b208c890fbc1dc09a
2018-10-02 20:16:12 -07:00
Treehugger Robot 9c68021f67 Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong" 2018-10-03 03:05:08 +00:00
Bowgo Tsai 040410c104 Prevent AVB signing from using _RESERVED_SIZE
When AVB is enabled with PRODUCT_USE_DYNAMIC_PARTITION_SIZE, AVB
metadata (e.g., hash tree, fec metadata) will consume _RESERVED_SIZE,
resulting in smaller reserved size in file system (e.g., ext4).

Adding additional space for AVB signing and keep the _RESERVED_SIZE only
for file system. This is done by adding a function to binary search an
optimal partition size for a given image size (disk usage + _RESERVED_SIZE).

Bug: 112322265
Test: Build aosp_arm64-userdebug, calculate the running time of
      AVBCalcMinPartitionSize() is about 0.3-0.4 seconds.
Test: python -m unittest test_build_image
Change-Id: I8f0051b57701d6fbba6a9db3756dd194066c74b8
2018-10-03 10:08:45 +08:00
Jayant Chowdhary a09f39e3b1 Merge "Reland "Add libbinderthreadstate to the VNDK.""" am: 8a8cf7b081 am: 3daa23eeb3
am: 4971ff5920

Change-Id: I1146770582ef654439819221e9ae4dadf5e58886
2018-10-02 15:22:52 -07:00
Jayant Chowdhary 4971ff5920 Merge "Reland "Add libbinderthreadstate to the VNDK.""" am: 8a8cf7b081
am: 3daa23eeb3

Change-Id: I15a946def5a4cfafc524d971e929aa369fee7b0f
2018-10-02 14:36:24 -07:00
Jayant Chowdhary 3daa23eeb3 Merge "Reland "Add libbinderthreadstate to the VNDK."""
am: 8a8cf7b081

Change-Id: I736b2b798f8036b54580b7bbfa993bca9b8b3cd3
2018-10-02 13:57:09 -07:00
Jayant Chowdhary 8a8cf7b081 Merge "Reland "Add libbinderthreadstate to the VNDK.""" 2018-10-02 20:14:37 +00:00
Vladimir Marko 1cb990eb01 Merge "Build: Remove boot*.art.rel file generation." am: 0e01669293 am: a3af0a2bea
am: e1321859b4

Change-Id: Ie565afb1c3b8ab94c26181d5a34e3370848ec63c
2018-10-02 10:13:39 -07:00
Vladimir Marko e1321859b4 Merge "Build: Remove boot*.art.rel file generation." am: 0e01669293
am: a3af0a2bea

Change-Id: I4f200709bcc6bacd70ec7f8323aedba8efc05be1
2018-10-02 10:06:06 -07:00
Vladimir Marko a3af0a2bea Merge "Build: Remove boot*.art.rel file generation."
am: 0e01669293

Change-Id: Ic54949d05a04bbd6f0c3a57dcbcc1c8cf09af99e
2018-10-02 09:58:58 -07:00
Vladimir Marko 0e01669293 Merge "Build: Remove boot*.art.rel file generation." 2018-10-02 16:38:11 +00:00
Anton Hansson 379b2ba485 Tidy up TARGET_COPY_OUT_X variable defs
- Don't duplicate the same comment over and over
- Stop defining values that are immediately overwritten

Test: make
Change-Id: I87cb2c2b76bb69a026695e145849f4acee197b94
2018-10-02 14:12:50 +01:00
Anton Hansson ab2c191a6e Merge "Record installed JNI libs in INSTALLED files." am: ec382da316 am: 240c1c0606
am: e9495ab0c2

Change-Id: I0f06e497fdeda1a66bbd4a8979e5e1a925ba78f5
2018-10-02 01:05:53 -07:00
Anton Hansson e9495ab0c2 Merge "Record installed JNI libs in INSTALLED files." am: ec382da316
am: 240c1c0606

Change-Id: I6b6be475a3ad6e0f032faac5a1d4cb9903ddf9e8
2018-10-02 00:55:51 -07:00
Vladimir Marko e47795ba3d Build: Remove boot*.art.rel file generation.
These files are now unused, patchoat shall be removed soon.

Test: m
Test: Pixel 2 XL boots.
Bug: 77856493
Change-Id: I07babe7e6b2657e340265e74042e958a91678329
2018-10-02 08:54:11 +01:00
Anton Hansson 240c1c0606 Merge "Record installed JNI libs in INSTALLED files."
am: ec382da316

Change-Id: Ia5f506ecfa40d97d869af1a16233ba608c99c949
2018-10-02 00:51:38 -07:00
Anton Hansson ec382da316 Merge "Record installed JNI libs in INSTALLED files." 2018-10-02 07:35:31 +00:00
Colin Cross f4686696c4 Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94 am: 7307de5e0c am: 4aa10a3cc5
am: 1033e0516b

Change-Id: I208a549fc8dd99fb511327a1c9c4d07e4f6cf54b
2018-10-01 19:38:25 -07:00
Colin Cross 1033e0516b Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94 am: 7307de5e0c
am: 4aa10a3cc5

Change-Id: I7d8db0f31a3ea4cac97898501f84e23e3f86f9dd
2018-10-01 19:22:13 -07:00
Colin Cross 4aa10a3cc5 Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94
am: 7307de5e0c

Change-Id: Ifa95c4ec335d9bf913f851101f09c55840091dce
2018-10-01 19:15:18 -07:00
Colin Cross 7307de5e0c Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94
* changes:
  Disable sdk_addon for mmm
  Use soong_zip for platform.zip
  Use soong_zip for otatools.zip and otacerts.zip
2018-10-02 01:55:47 +00:00
Jayant Chowdhary 18a75cb2c4 Reland "Add libbinderthreadstate to the VNDK.""
This reverts commit 13467f5993.

Reason for revert: Dependencies which broke tests due to exclusion from 
                   LOCAL_JNI_SHARED_LIBS have been added.

Change-Id: I4aca69d7bfa12a132b8334deb61ed350b434f5df
2018-10-01 22:52:07 +00:00
Colin Cross d0f3a3b01a Pass TARGET_PREFER_32_BIT_APPS to Soong
Bug: 80095087
Test: m checkbuild
Change-Id: I1ca8bebb360dd1e8102bb5840709f79cc22be03c
2018-10-01 15:31:54 -07:00
Colin Cross 74da73fd99 Merge "Fix boot_profile_jars.zip" am: e70d749190 am: 8c200e1865
am: 8f2474d368

Change-Id: I9dbcf12af171423ea12b88cce9cee1a27ae9f82e
2018-10-01 14:29:10 -07:00
Colin Cross 8f2474d368 Merge "Fix boot_profile_jars.zip" am: e70d749190
am: 8c200e1865

Change-Id: Icf3a476ef10efe5746f34d1501bd9789fd72bf07
2018-10-01 14:20:53 -07:00
Colin Cross 8c200e1865 Merge "Fix boot_profile_jars.zip"
am: e70d749190

Change-Id: Idd1e917dbd85fbfe5aea8d0d2b9598a0f7a7a50c
2018-10-01 14:14:47 -07:00
Colin Cross c9b86615f3 Merge "Fix PDK builds" am: aa1645504f am: 731b73fdf9
am: 3c5e1d1e78

Change-Id: I5f8b008d1896f24773412b796a50a556532131ab
2018-10-01 14:12:59 -07:00
Colin Cross 3c5e1d1e78 Merge "Fix PDK builds" am: aa1645504f
am: 731b73fdf9

Change-Id: I6c6a01c62cb9a50ec83506e564e523ff6ab94edb
2018-10-01 14:01:39 -07:00
Treehugger Robot e70d749190 Merge "Fix boot_profile_jars.zip" 2018-10-01 20:53:22 +00:00
Colin Cross 731b73fdf9 Merge "Fix PDK builds"
am: aa1645504f

Change-Id: Ia910bb42dcb225cc8e0d648bd0d890552251183f
2018-10-01 13:48:30 -07:00
Colin Cross 8b6c94c744 Disable sdk_addon for mmm
mmm has a smaller view of the world and cannot generate sdk-addon
zip files.

Bug: 116818719
Test: m checkbuild
Change-Id: I9e73c0b84a42aaaa353704d6ab245b449166606d
2018-10-01 13:41:27 -07:00
Colin Cross 7363cde33e Use soong_zip for platform.zip
soong_zip produces more reproducible zip files that are not
affected by umask values or timestamps.

This partially reapplies I2eca2f7618e06c0b5893ff54c79261921fe051d6
with fixes for 64-bit only builds and directories that are changing
during zipping.

Bug: 69500920
Test: m checkbuild
Test: m checkbuild platform
Test: lunch hikey64_only && m platform
Test: contents of zips is unchanged
Change-Id: Iac5c43276f7ae700d4d13d0ef27003d09c1c87e0
2018-10-01 13:41:27 -07:00
Colin Cross 21122f901c Use soong_zip for otatools.zip and otacerts.zip
soong_zip produces more reproducible zip files that are not
affected by umask values or timestamps.

This partially reapplies I2eca2f7618e06c0b5893ff54c79261921fe051d6.

Bug: 69500920
Test: m checkbuild
Test: contents of zips is unchanged
Change-Id: Idf6fbc94e257dc34af4f5b115d740b7cb9bac015
2018-10-01 13:41:27 -07:00
Colin Cross aa1645504f Merge "Fix PDK builds" 2018-10-01 20:30:30 +00:00
Anton Hansson dac7662157 Merge "Create a dump-files phony target." am: b7b43c2cd5 am: 74871e1ba3
am: 18b67b1bff

Change-Id: I9808c159412fd02c1f6ea1b2414245c19c062efe
2018-10-01 11:00:58 -07:00
Anton Hansson dce1af0c15 Merge "Add wrapped net utils to mainline_system." am: 0820a93d69 am: a88a8b6bb1
am: 49040dcf04

Change-Id: I9657ea6dd2c5e09d7220432da617f3246f23a121
2018-10-01 10:53:19 -07:00
Anton Hansson 18b67b1bff Merge "Create a dump-files phony target." am: b7b43c2cd5
am: 74871e1ba3

Change-Id: I90c6ae538e0e15d67723b5b628fcd8dabcd19b38
2018-10-01 10:46:58 -07:00
Colin Cross 1a81e372b5 Fix boot_profile_jars.zip
soong_zip was previously ignoring trailing command line arguments,
but now they are an error.  boot_profile_jars.zip had all its
files as trailing arguments instead of as -f flags, previously
resulting in an empty zip, but now causing an error.  Fix the
arguments to use -f before each file.

Test: m PRODUCT_DIST_BOOT_AND_SYSTEM_JARS=true out/target/product/sailfish/boot_profile_jars.zip
Change-Id: I8ac4aa4fbca812b8aa2ff9526e1ed7c769dd8420
2018-10-01 17:45:59 +00:00
Anton Hansson 49040dcf04 Merge "Add wrapped net utils to mainline_system." am: 0820a93d69
am: a88a8b6bb1

Change-Id: If0b5c0102193d32524751f950bee9b33aabcdf1a
2018-10-01 10:40:53 -07:00
Anton Hansson 74871e1ba3 Merge "Create a dump-files phony target."
am: b7b43c2cd5

Change-Id: I48267a69f78550e63436f5eb0830750e523ab6f4
2018-10-01 10:36:16 -07:00
Anton Hansson a88a8b6bb1 Merge "Add wrapped net utils to mainline_system."
am: 0820a93d69

Change-Id: I8eeabce2ced5b80205d02db366989650b1191bde
2018-10-01 10:31:42 -07:00
Anton Hansson b7b43c2cd5 Merge "Create a dump-files phony target." 2018-10-01 17:25:11 +00:00
Anton Hansson 0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson 6961e53876 Create a dump-files phony target.
This is more convenient than the current always-off conditional,
because it doesn't require changing the build system to dump
the installed files.

Bug: 80410283
Test: m dump-files
Change-Id: I7d395750673aff07d2018ffce8321dd280b94ccf
2018-10-01 16:26:17 +01:00
Anton Hansson 8b7ecc06c7 Record installed JNI libs in INSTALLED files.
The installed jni libs were previously not tracked in the way
other installed files were. One problem with this is that the
product-installed-files macro failed to track these files.

Bug: 80410283
Test: build_test
Change-Id: I85f528f228ef6921ed596d58303991a5370ae631
2018-10-01 16:23:53 +01:00
Anton Hansson 7963f26175 Merge "Add bluetooth libraries to mainline_system." am: e1d2c8d647 am: 5c9730bcc3
am: c5f2df2757

Change-Id: I26b8d4d160689495fb12ef3fe0383f9fe14ca31f
2018-10-01 05:10:19 -07:00
Anton Hansson 844688c561 Merge "Add the nfc_extras shared lib to mainline." am: 60be6ae961 am: 58577be60a
am: 5feda17237

Change-Id: I9159c5dc5eae0f9d69e7e40c3234f74e631edf08
2018-10-01 04:46:43 -07:00
Anton Hansson c5f2df2757 Merge "Add bluetooth libraries to mainline_system." am: e1d2c8d647
am: 5c9730bcc3

Change-Id: I7cf49bcf879e80d8dd3481d97e0bef0736db98ae
2018-10-01 04:20:14 -07:00
Anton Hansson 5c9730bcc3 Merge "Add bluetooth libraries to mainline_system."
am: e1d2c8d647

Change-Id: Ief3250f164bd57400fc6a0454eda3ab4745f50be
2018-10-01 04:13:58 -07:00
Anton Hansson e1d2c8d647 Merge "Add bluetooth libraries to mainline_system." 2018-10-01 10:57:27 +00:00