Commit Graph

46067 Commits

Author SHA1 Message Date
Doheon Lee
09d9b90625 Declare install path for product partition binaries
Build system will install binaries to product partition path when build
scripts specify module's install path to product partition.
To supports that, TARGET_OUT_PRODUCT_EXECUTABLES for primary and
secondary ABI path should be declared.

Bug: 110745956
Test: Set LOCAL_PRODUCT_MODULE to true in Android.mk or set product to
true in Android.bp file.

Change-Id: Ib8a491364ee30e49bb327163974661915e183608
2018-06-25 03:28:04 +00:00
Yifan Hong
89d8fdc732 Merge "build_image.py: remove extra new lines in error message" am: 674454f223 am: 1dce9b6943
am: 7455258853

Change-Id: Icd41da08dea39c168f18549293d60bae792b4359
2018-06-22 22:12:35 -07:00
Yifan Hong
7455258853 Merge "build_image.py: remove extra new lines in error message" am: 674454f223
am: 1dce9b6943

Change-Id: I0aef5168a92fe4ab585d7ec69b9f30a0ed5aabb1
2018-06-22 22:09:25 -07:00
Yifan Hong
1dce9b6943 Merge "build_image.py: remove extra new lines in error message"
am: 674454f223

Change-Id: Iaa6edf6b28c5d2e5cdbc55068ab2631c17138288
2018-06-22 22:06:16 -07:00
Treehugger Robot
674454f223 Merge "build_image.py: remove extra new lines in error message" 2018-06-23 04:55:44 +00:00
Yifan Hong
b6b3660a8e Merge "Add BOARD_SUPER_PARTITION_*" am: 254bd9a10a am: 6423900f83
am: 93dc348ec6

Change-Id: I74dcdb01ee73a30d6f32a2fd2f140fab2e5670fb
2018-06-22 16:47:57 -07:00
Yifan Hong
93dc348ec6 Merge "Add BOARD_SUPER_PARTITION_*" am: 254bd9a10a
am: 6423900f83

Change-Id: I81ac908e619ec4a91cb2aa32ea0bcfb719c890f0
2018-06-22 16:44:48 -07:00
Yifan Hong
6423900f83 Merge "Add BOARD_SUPER_PARTITION_*"
am: 254bd9a10a

Change-Id: Iada0cb6fe92ecf090a3c37bb3bd73335a2e63a8c
2018-06-22 16:40:15 -07:00
Treehugger Robot
254bd9a10a Merge "Add BOARD_SUPER_PARTITION_*" 2018-06-22 23:33:14 +00:00
Weilun Du
2276fb95cf Copy dummy userdata.img to sdk_addon images.
Avd manager in Android Studio requires userdata.img in the downloaded
system image. As we no longer inlcude the real userdata.img, we copy the
dummy userdata.img to pass the check.
This cl does not impact real devices.

BUG: 110492064
Test: Manual
1, Build with command "make -j110 PRODUCT-sdk_gphone_x86-sdk_addon".
2, Check if the dummy userdata.img appears in sdk addon image zip.
Change-Id: Icb88aac42921502288efe7355b8cd76704d5eb30
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-22 23:01:57 +00:00
Yifan Hong
92fb231105 build_image.py: remove extra new lines in error message
Test: m dist
Change-Id: I7908e4eb0a9bbcb187e1fa6d15f606537d69864d
2018-06-22 15:05:46 -07:00
Yifan Hong
9333f157ab Merge changes from topic "board_partition_reserved_size" am: 3967e0eb99 am: bb42f7d655
am: c729c9cf15

Change-Id: Id510d732757783135b9f74e5fc06b63f4a609af6
2018-06-22 13:50:41 -07:00
Yifan Hong
c729c9cf15 Merge changes from topic "board_partition_reserved_size" am: 3967e0eb99
am: bb42f7d655

Change-Id: I05665b9e3e54191f8417ecd6a32c68f06f297992
2018-06-22 13:36:16 -07:00
Yifan Hong
bb42f7d655 Merge changes from topic "board_partition_reserved_size"
am: 3967e0eb99

Change-Id: I767967f1086ec303c63199d0e38ec02dedf09152
2018-06-22 13:25:18 -07:00
Treehugger Robot
3967e0eb99 Merge changes from topic "board_partition_reserved_size"
* changes:
  build_image.py recognize BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE
  build_image.py recognize BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE
2018-06-22 20:10:47 +00:00
Dan Willemsen
875b419353 Merge "Mark implicit rules as obsolete" am: e82b12cb09 am: abc350d8b2
am: 19b901ca8d

Change-Id: I3809a871ce7bf9827b30467aa291669559d6dec5
2018-06-22 10:27:49 -07:00
Yifan Hong
74d07ff8bd Add BOARD_SUPER_PARTITION_*
Test: builds
Test: build with BOARD_SUPER_PARTITION_SIZE and
      BOARD_SUPER_PARTITION_PARTITION_LIST defined

Bug: 79106666

Change-Id: Ifcd50ecab22ef096ff1eb386f8d87e16fffdcf5e
2018-06-22 10:25:54 -07:00
Yifan Hong
749062d379 build_image.py recognize BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE
Test: `make vendorimage`

Test: `make vendorimage` with the following:
    - install a large file to vendor image
    fails as expected (because _PARTITION_SIZE is exceeded)

Test: `make vendorimage` with the following:
    - set PRODUCT_USE_LOGICAL_PARTITIONS to true
    - set BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE
    fails as expected (BOARD_VENDORIMAGE_PARTITION_SIZE needs
    to be undefined)

Test: `make vendorimage` with the following:
    - install a large file to vendor image
    - set PRODUCT_USE_LOGICAL_PARTIIONS to true
    - add a small BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE
    - remove BOARD_VENDORIMAGE_PARTITION_SIZE
    build succeeds.

Bug: 79106666

Change-Id: Ica8fdce64e8f37d91e66e3d49c0c74fadd15a832
2018-06-22 10:25:54 -07:00
Yifan Hong
bbcba1e353 build_image.py recognize BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE
- Copy "use_logical_partitions" to *_image_info.txt before sending
  it to build_image.py, so that the script can use this variable.

- build_image.py emits an additional properties file to inform
  the build system about the system image size.

Test: `make systemimage`

Test: `make systemimage` with the following:
    - install a large file to system image
    fails as expected (because _PARTITION_SIZE is exceeded)

Test: `make systemimage` with the following:
    - set PRODUCT_USE_LOGICAL_PARTITIONS to true
    - set BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE
    fails as expected (BOARD_SYSTEMIMAGE_PARTITION_SIZE needs
    to be undefined)

Test: `make systemimage` with the following:
    - install a large file to system image
    - set PRODUCT_USE_LOGICAL_PARTIIONS to true
    - add a small BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE
    - remove BOARD_SYSTEMIMAGE_PARTITION_SIZE
    build succeeds.

Test: same for systemotherimage

Bug: 79106666

Change-Id: I574062882acd1ecd633ac38c5a8c5351b90a32d8
2018-06-22 10:25:54 -07:00
Dan Willemsen
19b901ca8d Merge "Mark implicit rules as obsolete" am: e82b12cb09
am: abc350d8b2

Change-Id: I1ec3406c1c69a8a977deb26755ba7ef47f26e54c
2018-06-22 10:23:40 -07:00
Dan Willemsen
abc350d8b2 Merge "Mark implicit rules as obsolete"
am: e82b12cb09

Change-Id: Ie725a5593596508491c3d13d66e354211df2ccd7
2018-06-22 10:19:33 -07:00
Treehugger Robot
e82b12cb09 Merge "Mark implicit rules as obsolete" 2018-06-22 17:10:36 +00:00
TreeHugger Robot
53fa5bfa55 Merge "Remove vr_hwc from GSI image." 2018-06-22 16:15:06 +00:00
Jiyong Park
68ee5bdbb7 Merge "Don't check the vndk lib list for 64-bit only product" am: e2bc1154bf am: b50ab74ea2
am: 83395b002b

Change-Id: I22c2ba439517f48b6e04bddb82a870f6ffb50e5a
2018-06-22 01:08:11 -07:00
Jiyong Park
83395b002b Merge "Don't check the vndk lib list for 64-bit only product" am: e2bc1154bf
am: b50ab74ea2

Change-Id: I16734cd2c1b98cc81fbc859cb6138d00a8e44b3a
2018-06-22 01:05:01 -07:00
Jiyong Park
b50ab74ea2 Merge "Don't check the vndk lib list for 64-bit only product"
am: e2bc1154bf

Change-Id: Icf3457d7321d18ebb8f194895cae1a2443409ece
2018-06-22 00:57:45 -07:00
Treehugger Robot
e2bc1154bf Merge "Don't check the vndk lib list for 64-bit only product" 2018-06-22 07:51:04 +00:00
Dan Willemsen
5f76fc0d7c Mark implicit rules as obsolete
Test: view Changes.md in gitiles
Change-Id: Id5691dc099b23df4d94b0ca30725702bc282b998
2018-06-21 21:42:29 -07:00
Jiyong Park
b930d1d397 Don't check the vndk lib list for 64-bit only product
vndk-check-list check can't be done for 64-bit only product. Some
VNDK libraries (libstagefright_codec_*) are 32-bit only and thus
not built for 64-bit only product. As a result vndk-check-list always
fails on such device. Suppressing the error until the codec libraries
are built with 64-bit.

Bug: 110429754
Test: m -j on hikey64_only
Change-Id: I240ceee3fd0a778e47904ed44a1964084f354141
2018-06-22 12:58:31 +09:00
Jiyong Park
c3b9cbc15f Merge "check-vndk-list is run even when VNDK is not enabled" am: 931c5a5d33 am: 91e6f590f0
am: 6d6b4d9b66

Change-Id: Icc210d69d6cf7d3eeaf3c6c0af3453fc4ab4b157
2018-06-21 18:30:56 -07:00
Jiyong Park
6d6b4d9b66 Merge "check-vndk-list is run even when VNDK is not enabled" am: 931c5a5d33
am: 91e6f590f0

Change-Id: I6786bc1494c0dd5823b66893b1769a92af37fe1b
2018-06-21 18:26:46 -07:00
Jiyong Park
91e6f590f0 Merge "check-vndk-list is run even when VNDK is not enabled"
am: 931c5a5d33

Change-Id: I00230be053b4e01591f2beaa8905481a1718c98a
2018-06-21 18:21:50 -07:00
Treehugger Robot
931c5a5d33 Merge "check-vndk-list is run even when VNDK is not enabled" 2018-06-22 01:09:04 +00:00
Colin Cross
da95ebccf4 Merge "Always use OpenJDK9 for building" am: 12eafb61b0 am: c0071808da
am: 787908b657

Change-Id: I3268b688a5c1d394fb91a7e32cd87d88929024f0
2018-06-21 15:41:35 -07:00
Colin Cross
787908b657 Merge "Always use OpenJDK9 for building" am: 12eafb61b0
am: c0071808da

Change-Id: I3fad8442601e5b9a57aee8285b54cc025926d6ec
2018-06-21 15:06:51 -07:00
Colin Cross
c0071808da Merge "Always use OpenJDK9 for building"
am: 12eafb61b0

Change-Id: Iec1529983659c3c966b32c384c337d6db5144766
2018-06-21 14:56:35 -07:00
Colin Cross
12eafb61b0 Merge "Always use OpenJDK9 for building" 2018-06-21 21:27:16 +00:00
Colin Cross
fd5607604d Merge "Run ErrorProne in OpenJDK9" am: 264bc07791 am: 2e51d73d2b
am: 35dd89e804

Change-Id: I1c7f2c1b6ec77605eca91a5086358223a214367c
2018-06-21 14:08:21 -07:00
Colin Cross
35dd89e804 Merge "Run ErrorProne in OpenJDK9" am: 264bc07791
am: 2e51d73d2b

Change-Id: I92c8b062a1a92a0007d2a1ec4ff2a1797989e3d1
2018-06-21 14:02:10 -07:00
Colin Cross
2e51d73d2b Merge "Run ErrorProne in OpenJDK9"
am: 264bc07791

Change-Id: I3ce7202cdcfd3e86fbccb359f56ca59581855a04
2018-06-21 13:57:20 -07:00
Colin Cross
264bc07791 Merge "Run ErrorProne in OpenJDK9" 2018-06-21 20:47:41 +00:00
Tom Cherry
3f47371b2b Merge "Reland: Verify init scripts for correctness during build" am: bdaaab2e39 am: 281d343dfb
am: a30f1ad58c

Change-Id: I1445a4c0822a7465af20e2fc35ba7b7b81fd56fa
2018-06-21 13:20:14 -07:00
Tom Cherry
a30f1ad58c Merge "Reland: Verify init scripts for correctness during build" am: bdaaab2e39
am: 281d343dfb

Change-Id: I2e0ff2a5dd77808cc2c4fa7301f08b2b321d642c
2018-06-21 13:17:02 -07:00
Tom Cherry
281d343dfb Merge "Reland: Verify init scripts for correctness during build"
am: bdaaab2e39

Change-Id: Ia0cdc6067e357e97ab88b1dd2690358ead4edd18
2018-06-21 13:12:54 -07:00
Treehugger Robot
bdaaab2e39 Merge "Reland: Verify init scripts for correctness during build" 2018-06-21 20:01:50 +00:00
Dan Willemsen
4cf2a4ec05 Merge changes from topics "deprecate_export", "add_build_broken" am: 08015aa03b am: a6e1fadea5
am: e2e0ee1dd8

Change-Id: Id51daaa2ae7d85a5b4aa6aa78cba9e2244fddba5
2018-06-21 12:39:39 -07:00
Dan Willemsen
e2e0ee1dd8 Merge changes from topics "deprecate_export", "add_build_broken" am: 08015aa03b
am: a6e1fadea5

Change-Id: Ia5ecc637bcf2a5c4eb2308f24c3837ef74412b12
2018-06-21 12:36:11 -07:00
Dan Willemsen
a6e1fadea5 Merge changes from topics "deprecate_export", "add_build_broken"
am: 08015aa03b

Change-Id: I3f22f431acdcd233ddd73a248eb510d55a9a194e
2018-06-21 12:32:14 -07:00
Colin Cross
1588c0ee57 Always use OpenJDK9 for building
Remove support for compiling with javac from OpenJDK8.
We still target 1.8 by default, and OpenJDK8 prebuilts are still
required for the bootclasspath and running robolectric.

Bug: 38418220
Test: m java
Change-Id: I6f178f73b42331494fadcc25a62a5475656b873e
2018-06-21 12:22:37 -07:00
Dan Willemsen
08015aa03b Merge changes from topics "deprecate_export", "add_build_broken"
* changes:
  Mark export/unexport as deprecated
  Add more BUILD_BROKEN_* logic
2018-06-21 19:19:51 +00:00