Commit graph

36556 commits

Author SHA1 Message Date
Colin Cross
37210994ff Support LOCAL_JACK_ENABLED := javac_frontend
Allow working around Jack bugs by using javac to compile *.java
to class files, and then pass through Jack for desugaring,
proguarding, and dexing.

Also make ANDROID_COMPILE_WITH_JACK=false override LOCAL_JACK_ENABLED.

Bug: 37483961
Test: m -j checkbuild
Test: Add LOCAL_JACK_ENABLED := javac_frontend to a target
Change-Id: I2189055aac9deccc36b8eab8e949796dddadf7a1
Merged-In: I2189055aac9deccc36b8eab8e949796dddadf7a1
(cherry picked from commit b17f285169)
2017-05-02 13:11:35 -07:00
Tao Bao
cc2bfa484e Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev 2017-04-26 21:23:41 +00:00
Tao Bao
b63c952cc7 Revert "Revert "Add compatibility metadata to OTA package""
This reverts commit b1e59b8a73.

This CL enables generating compatibility zip entry in an A/B OTA
package. We're not enabling the support for non-A/B OTAs for now until
they have the necessary support (e.g. /proc/config.gz exists).

Bug: 36810913
Test: Generate full and incremental packages for marlin and applly under
      normal boot and sideload respectively.

Change-Id: I69f0a3feb7a0efc7f727f92f31c9e63f47ee6530
2017-04-25 15:04:41 -07:00
TreeHugger Robot
387d93f0a9 Merge "Overridden packages shouldn't install vdex files either" into oc-dev 2017-04-25 06:21:43 +00:00
TreeHugger Robot
90d202fb7f Merge "Make mini-debug-info stripping pass on already stripped binaries" into oc-dev 2017-04-25 04:06:12 +00:00
Dan Willemsen
b50bbcc72a Overridden packages shouldn't install vdex files either
Bug: 37348494
Test: internal marlin, check for WebViewGoogle.vdex
Change-Id: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
Merged-In: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
(cherry picked from commit e224725c95)
2017-04-20 13:34:44 -07:00
Diego Wilson
77fcc43b6c Remove BOARD_USES_RECOVERY_AS_BOOT from aosp_arm64_ab
The target does not have a kernel so this flag does
not make sense.

Bug: 37443196
Test: flash aosp_arm64_ab system.img on sailfish
Change-Id: I1f22866dd5ecdd16615c02fdc8aa898b1ec2ddbd
2017-04-20 11:36:50 -07:00
TreeHugger Robot
dd4cdfd30a Merge changes Ieb58dd9a,I8ada38df into oc-dev
* changes:
  AVB: support BOARD_BUILD_SYSTEM_ROOT_IMAGE
  AVB: support signing vendor.img
2017-04-18 04:10:58 +00:00
Tao Bao
533183dc68 Merge "Revert "Add compatibility metadata to OTA package"" into oc-dev 2017-04-17 20:38:44 +00:00
Tao Bao
b1e59b8a73 Revert "Add compatibility metadata to OTA package"
This reverts commit 853cd306b0.

Temporarily reverting the CL to work around the bug in recovery code.

Bug: 37413730
Change-Id: I8e77112ffafcf32332794739ee1c855cc83b32b0
2017-04-17 18:40:18 +00:00
Colin Cross
3aa1ef8bcd Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)
If PRIVATE_PREFIX is unset transform-prebuilt-to-target references
$(DISPLAY) instead of $(HOST_DISPLAY) or $(TARGET_DISPLAY), which
causes unnecessary kati regenerations when the DISPLAY environment
variable changes.

Bug: 36901093
Bug: 37333696
Test: grep for $DISPLAY in out/build-${TARGET_PRODUCT}.ninja
Change-Id: Ia9802fc2b07da9b74e8f80dfdcef121408cd9817
(cherry picked from commit d2e778fb5a)
2017-04-17 11:33:50 -07:00
Colin Cross
0af734d077 Make mini-debug-info stripping pass on already stripped binaries
Prebuilts may already be stripped.  Instead of requiring every stripped
prebuilt to be annotated with LOCAL_STRIP_MODULE := false, just make
the default (mini-debug-info) pass through already-stripped modules
without failing.

Bug: 36793128
Test: m -j checkbuild
Change-Id: Iafc4614ceb91bbbb2e5ff82caefd18753f8961b1
Merged-In: Iafc4614ceb91bbbb2e5ff82caefd18753f8961b1
(cherry picked from commit 5e93057da4)
2017-04-17 11:40:23 +08:00
Jaesoo Lee
41e5dff370 fixed build errors for aosp generic system image
Following files are missing in AOSP and not needed
- device/google/marlin/init.recovery.common.rc
- vendor/google/products/marlin/bootanimation-1440-256col.zip
- vendor/google/certs/devkeys/devkey

Bug: 37259658
Test: built systemimage and tested it work with other sailfish images
Change-Id: I95e180b6adbe8d08348794fd6b5f41e810999aea
2017-04-17 12:33:02 +09:00
Jiyong Park
279e3c2ae3 install android.hidl.*-java.jar files by default
Without this, the jar files are not installed to /system/framework and
thus the classes in the libraries become unaccessible during the direct
boot mode, where java code is directly interpreted from the jar files
instaed of the odex file.

Bug: 37363533
Test: android.hidl.*-java.jar are installed at /system/framework
Test: no crash of com.qualcomm.qti.telephonyservice upon boot (with data
partition protected with pin or pattern)

Change-Id: Ib3d5f9b7abd907d89a793e7501055c289145b239
2017-04-15 15:01:28 +09:00
Bowgo Tsai
16ba563b71 AVB: support BOARD_BUILD_SYSTEM_ROOT_IMAGE
Passing --setup_rootfs_from_kernel to avbtool when
BOARD_BUILD_SYSTEM_ROOT_IMAGE is true

Bug: 33590159
Test: 'make' sailfish with BOARD_AVB_ENABLE := true
Test: 'make dist' with BOARD_AVB_ENABLE := true
Change-Id: Ieb58dd9ae6be1eceb90a33c739b85cff5cbc6e0a
Merged-In: Ieb58dd9ae6be1eceb90a33c739b85cff5cbc6e0a
(cherry picked from commit 9b3776017f)
2017-04-15 13:57:42 +08:00
Bowgo Tsai
3f0fd3d085 AVB: support signing vendor.img
Uses avbtool to sign vendor.img if BOARD_AVB_ENABLE is set.
It also allows appending additional arguments to avbtool via
BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS.

e.g.,
  BOARD_AVB_ENABLE := true
  BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS := --generate_fec

Bug: 35415839
Test: "make" with the above variables and use avbtool to check vbmeta is
      appended to vendor.img
Test: "make dist" with the above variables

Change-Id: I8ada38dff3def6d34613e77c67944def8a49f464
Merged-In: I8ada38dff3def6d34613e77c67944def8a49f464
(cherry picked from commit 8ee4a3db8c)
2017-04-15 13:57:21 +08:00
TreeHugger Robot
9fdd426c91 Merge "Change ld.config.txt to a module" into oc-dev 2017-04-15 01:47:40 +00:00
TreeHugger Robot
ffd66c35bf Merge changes from topic 'assemble_vintf' into oc-dev
* changes:
  Use assemble_vintf to verify framework manifests.
  Use assemble_vintf to verify device manifests.
2017-04-15 01:21:23 +00:00
Yifan Hong
aa21221f80 Use assemble_vintf to verify framework manifests.
Test: builds, and verify that system/manifest.xml is there.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: Ic3bb50211311fa423a2ad56bd2891cb57d7dc1a5
2017-04-14 16:29:55 -07:00
Yifan Hong
283af596eb Use assemble_vintf to verify device manifests.
Test: builds, and verify that vendor/manifest.xml has
sepolicy version.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: I10e4cff6ed1b78a7cb9239e822ab054e1b90e7d3
2017-04-14 16:29:04 -07:00
Justin Klaassen
89f74db432 Merge "Add "android.software.preview_sdk" feature" into oc-dev 2017-04-14 22:39:59 +00:00
TreeHugger Robot
5a933fc8d5 Merge "Add compatibility metadata to OTA package" into oc-dev 2017-04-14 20:56:20 +00:00
Martijn Coenen
d75be23640 Merge "Add HIDL base/manager packages to PRODUCT_BOOT_JARS." into oc-dev 2017-04-14 05:43:49 +00:00
Michael Schwartz
853cd306b0 Add compatibility metadata to OTA package
Store the metadata in a archive within the OTA package so the collection
can be retrieved as a single unit by the device.

Bug: 36810913
Test: `make dist` marlin (ab) and angler (non-AB) for incremental and full OTA.
Change-Id: I94118e48a3c6ed5ff890b67d7dafbca02346aeea
2017-04-13 21:32:05 -07:00
Michael Schwartz
ceeaa7be20 Merge "Rule to copy device manifest to device" into oc-dev 2017-04-14 03:25:55 +00:00
Martijn Coenen
53b345dd22 Merge "Add NfcNci to default builds." into oc-dev 2017-04-14 03:18:40 +00:00
Steven Moreland
dfabcc5566 Add HIDL base/manager packages to PRODUCT_BOOT_JARS.
Bug: 36603742
Bug: 36565056
Test: marlin boots, dynamically linking against these works
Change-Id: I1bfb73f2bce858823ad6ba8d826e42bd38cc2317
2017-04-13 19:30:48 -07:00
Adam Seaton
8891d2773b Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce am: d671313b5d am: 6ee17025d4
am: 822b3f7bf4

Change-Id: Iffd43a310f576488aee8b34123b738cf9adfb05e
2017-04-13 23:26:23 +00:00
Adam Seaton
c55849c9b9 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours am: 35a5e32514 -s ours am: 55a3be5bc5 -s ours
am: eb3dadebf6  -s ours

Change-Id: Ic558df5c8e4237e533cf7bb5e1082e66326d7be0
2017-04-13 23:26:15 +00:00
Adam Seaton
9a4b41442b Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7 am: 5b6859d20d am: 29eab65da9
am: a8b8550fa8

Change-Id: I2d375bf20dbdc753b41de1023cdeee2675940c82
2017-04-13 23:26:00 +00:00
Adam Seaton
822b3f7bf4 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce am: d671313b5d
am: 6ee17025d4

Change-Id: Ice88dd3019d8779bfa4111f024cb2a9714faf97c
2017-04-13 23:20:26 +00:00
Adam Seaton
eb3dadebf6 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours am: 35a5e32514 -s ours
am: 55a3be5bc5  -s ours

Change-Id: I764b9eda953274dce882c16a4c2123abfba96ad0
2017-04-13 23:20:17 +00:00
Adam Seaton
a8b8550fa8 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7 am: 5b6859d20d
am: 29eab65da9

Change-Id: I7159c03722f1c2918fdfb3ed362b2f284a4d2329
2017-04-13 23:19:59 +00:00
Adam Seaton
61d5798ba8 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 6be965be74
am: 12d7052ea6

Change-Id: I9034c10fdb5c5bdc677cc045c5af347aebeff795
2017-04-13 23:14:19 +00:00
Adam Seaton
6ee17025d4 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce
am: d671313b5d

Change-Id: I01863550bba9ece32050063e78724f8b3a1c438f
2017-04-13 23:14:18 +00:00
Adam Seaton
55a3be5bc5 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours
am: 35a5e32514  -s ours

Change-Id: Ie82cad7482d9292f5693bddaa300865e334c06b1
2017-04-13 23:14:11 +00:00
Adam Seaton
be9f4b6c25 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 am: 0a38661a39
am: 521d7efcc3  -s ours

Change-Id: I1006fd3372af47a41e27f398eb21e53a58a3793b
2017-04-13 23:14:11 +00:00
Adam Seaton
513272340b Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: 07d9fa6787
am: 8f91143bde

Change-Id: Ia28d5e4f1e1e2d28b8c1d9a32ff5f0f5064cee46
2017-04-13 23:13:59 +00:00
Adam Seaton
29eab65da9 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7
am: 5b6859d20d

Change-Id: Id64c803bc5a4e8ee31a8b5821522694bd00c3c5e
2017-04-13 23:13:58 +00:00
Adam Seaton
12d7052ea6 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6
am: 6be965be74

Change-Id: I326d377498ff0aee061f2e7d79ffc53d8f207a43
2017-04-13 23:08:20 +00:00
Adam Seaton
d671313b5d Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6
am: 51321907ce

Change-Id: Ibaa81e078a72574f33b1cd56d9f3422995509325
2017-04-13 23:08:17 +00:00
Adam Seaton
521d7efcc3 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0
am: 0a38661a39

Change-Id: I430683f3f69df6f57cbc7779137dadb5a1d1244b
2017-04-13 23:08:12 +00:00
Adam Seaton
35a5e32514 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours
am: 7038c523a9  -s ours

Change-Id: Ifb32020acf065ab8c7877acd91327cb403e72c30
2017-04-13 23:08:09 +00:00
Adam Seaton
8f91143bde Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
am: 07d9fa6787

Change-Id: I24dc2bc058fa34b0da8a75acb192156f71316d84
2017-04-13 23:07:58 +00:00
Adam Seaton
5b6859d20d Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
am: a8cd228fc7

Change-Id: I39f95edc4341bfba68a3a04e11a32a75b263668a
2017-04-13 23:07:58 +00:00
Adam Seaton
6be965be74 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
am: 51c0c361a6

Change-Id: I389c07f81d5ddfd34b139f5e83b988ae0c80fc16
2017-04-13 23:02:19 +00:00
Adam Seaton
51321907ce Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
am: 51c0c361a6

Change-Id: Ibf968d0954a4f148e91902ccd117b2e217b223d0
2017-04-13 23:02:18 +00:00
Adam Seaton
0a38661a39 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85
am: 2ae448cdb0

Change-Id: Iccfbe3f60592ca0250bcf5c2884200f772ab0600
2017-04-13 23:02:12 +00:00
Adam Seaton
7038c523a9 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85
am: 2ae448cdb0  -s ours

Change-Id: If3f2e5eed149fa6ac20d64313b0c1d95dfc980cf
2017-04-13 23:02:10 +00:00
Adam Seaton
07d9fa6787 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693
am: c88e5bdef3

Change-Id: I97e08b421917ac884f2b0f41c01bc046585ae91c
2017-04-13 23:01:58 +00:00