Commit graph

13416 commits

Author SHA1 Message Date
Colin Cross
5cf757bb85 Merge "Use dx.jar directly" am: c68434c971
am: 4828fcad41

Change-Id: I0e65499eaf42aef400be07868e40454cd1c2d5ac
2017-07-17 20:49:10 +00:00
Jeff Gaston
7ce0d9c1e7 Merge "Update to latest jacoco usage" am: 483fae7430
am: 6264b662f3

Change-Id: Icd22319fb34575925c140e619b5f099fa68b0ab0
2017-07-17 20:48:40 +00:00
Colin Cross
4828fcad41 Merge "Use dx.jar directly"
am: c68434c971

Change-Id: Ief2c88d3ba0e93c7eb7bb9db0ac2b0a0b886bcea
2017-07-17 20:45:31 +00:00
Jeff Gaston
6264b662f3 Merge "Update to latest jacoco usage"
am: 483fae7430

Change-Id: Ibc94d5ba6db7690441825dd655b6cb26d989b78d
2017-07-17 20:44:10 +00:00
Colin Cross
c68434c971 Merge "Use dx.jar directly" 2017-07-17 20:40:13 +00:00
Jeff Gaston
483fae7430 Merge "Update to latest jacoco usage" 2017-07-17 20:36:39 +00:00
Bowgo Tsai
9a797706b5 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3
am: bd91ac7740

Change-Id: I26cd1570d7cba2704339b60f00fa09ddd689611a
2017-07-15 00:02:03 +00:00
Bowgo Tsai
bd91ac7740 Merge "custom_images: support verity fec (forward error correction)"
am: abf553c9d3

Change-Id: I4b6e678859538ac91fc2548fc7195677660af37c
2017-07-14 23:58:45 +00:00
Treehugger Robot
abf553c9d3 Merge "custom_images: support verity fec (forward error correction)" 2017-07-14 23:51:47 +00:00
Tianjie Xu
4b53a17756 Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1
am: a07a04c737

Change-Id: I5f2b92791a759def118c6aa70a3e0777a9e8da85
2017-07-14 23:30:32 +00:00
Tianjie Xu
a07a04c737 Merge "Generate brotli compressed {}.new.dat for full OTA"
am: 1b28eca1a1

Change-Id: I3474e8efb634513fbc4876e5c272cf56b3443e12
2017-07-14 23:27:21 +00:00
Tianjie Xu
1b28eca1a1 Merge "Generate brotli compressed {}.new.dat for full OTA" 2017-07-14 23:21:54 +00:00
Colin Cross
453fcba264 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed
am: 06f8dec6e0

Change-Id: I348fda356863ef77e166782a666233239c1bde32
2017-07-14 23:13:31 +00:00
Colin Cross
06f8dec6e0 Merge "Fix LOCAL_JAR_PROCESSOR dependency"
am: 126e625fed

Change-Id: Ibe2786aa8853ea34513903728ae06fb5c5c39101
2017-07-14 23:10:57 +00:00
Treehugger Robot
126e625fed Merge "Fix LOCAL_JAR_PROCESSOR dependency" 2017-07-14 23:06:48 +00:00
Jeff Gaston
aaae43cd24 Update to latest jacoco usage
Bug: 36792868
Test: EMMA_INSTRUMENT_STATIC=true m -j

Change-Id: I419b543283b52be9a72f5c6b10e4cbea68782174
2017-07-14 13:04:05 -07:00
Steven Moreland
4e3bdda4e9 Merge "Define paths for vendor native tests." am: f4f8e91a5d
am: c9bc937d6d

Change-Id: I2a5d0d84fd9613358e950695ca46d0b8e24c2620
2017-07-14 18:45:42 +00:00
Steven Moreland
c9bc937d6d Merge "Define paths for vendor native tests."
am: f4f8e91a5d

Change-Id: I723f27e825fd210db12a26adef003bbd166f215c
2017-07-14 18:42:10 +00:00
Treehugger Robot
f4f8e91a5d Merge "Define paths for vendor native tests." 2017-07-14 18:34:59 +00:00
Tianjie Xu
b0a29ad8c2 Generate brotli compressed {}.new.dat for full OTA
Brotli has a better compression ratio than deflation. So for non-AB
full OTA, we can compress the new.dat with brotli first and store it
in the zip package.
This increase the OTA generation time by ~5 minutes for a full OTA
(measured based on 2.0G system.new.dat)

Bug: 34220646
Test: Generate a full OTA for bullhead
Change-Id: I9c0550af8eafcfa68711f74290c8e2d05a96648f
2017-07-14 10:53:21 -07:00
Bowgo Tsai
8ec2a1cb08 custom_images: support verity fec (forward error correction)
Bug: 63691195
Test: `make custom_images` with CUSTOM_IMAGE_SUPPORT_VERITY_FEC := true
Test: boot device with the custom image built above

Change-Id: I198fa1e0697cb00712bbfb6f1a717ec623703ede
2017-07-14 21:47:13 +08:00
Jiyong Park
9fc093f932 Merge "Don't allow JNI headers for vendors" am: b253e8e854
am: 9e89245a2c

Change-Id: I6f7269591191453131aae56ec44cabe41683c419
2017-07-14 03:42:49 +00:00
Jiyong Park
9e89245a2c Merge "Don't allow JNI headers for vendors"
am: b253e8e854

Change-Id: I6e3de31f388150301db9f0d0dd1bee3b7e39f413
2017-07-14 03:39:49 +00:00
Treehugger Robot
b253e8e854 Merge "Don't allow JNI headers for vendors" 2017-07-14 03:34:50 +00:00
Colin Cross
89b802b994 Fix LOCAL_JAR_PROCESSOR dependency
The LOCAL_JAR_PROCESSOR rule should depend on the path to the
processor jar and not the module name.

Test: m -j && m -j
Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7
2017-07-13 19:25:47 -07:00
Steven Moreland
cbfba70a9f Define paths for vendor native tests.
Test: manually check paths are desired using:
  $(error $(TARGET_OUT_VENDOR_NATIVE_TESTS))
  with both 'm -j' and 'm -j BOARD_VNDK_VERSION=current'
Fixes: 62495833
Change-Id: I236718f845d8ab604a0aec06b3220bc1c4f3d36b
2017-07-13 15:46:00 +00:00
Jiyong Park
b43a52d79d Don't allow JNI headers for vendors
This is already blocked in Soong. Do the same for make.

Bug: 63553556
Test: BOARD_VNDK_VERSION=current m -j libSampleAuthJNI cannot be built
Change-Id: I04a89b3f9de903a6b0384f13d5a80886344c14b4
2017-07-13 15:51:07 +09:00
Jiyong Park
e6cab73dcd Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6
am: 240f1d5ffe

Change-Id: Icd3959c1415b7ce2f4162a460faf076f2ad38b79
2017-07-12 20:56:53 +00:00
Jiyong Park
240f1d5ffe Merge "fix: device_kernel_headers can't be found in the make world"
am: 1aa29599c6

Change-Id: Ic588932665fe23e7bc50ec6a751aad3449a52018
2017-07-12 20:54:23 +00:00
Jiyong Park
cb8e636ed0 fix: device_kernel_headers can't be found in the make world
Since device_kernel_headers is marked as 'vendor:true', it is exported
to the make world as device_kernel_headers.vendor. Use the correct name
with the .vendor suffix.

Bug: none
Test: BOARD_VNDK_VERSION=current m -j does not complain about
device_kernel_headers.

Change-Id: If3eaa3c5832820c914ef427668d70fa8d8d0bf97
2017-07-12 18:29:17 +09:00
Howard Chen
e4b1bdaa9e Merge "Support kernel modules in the odm image" am: 95a8c7e83f
am: 1b0da968a0

Change-Id: Ic59862cdc3314ffc99df4955cf20aaacc34f2209
2017-07-11 02:12:26 +00:00
Howard Chen
1b0da968a0 Merge "Support kernel modules in the odm image"
am: 95a8c7e83f

Change-Id: Ib34b1eb969b5fffba4040f40143ea1f3679d4913
2017-07-11 02:10:24 +00:00
Howard Chen
0c5f1e575d Support kernel modules in the odm image
This patch reuses the build-image-kernel-modules macro to build the
odm/lib/modules directory according to the BOARD_ODM_KERNEL_MODULES
which contains list of kernel module files.

Bug: 36012197
Test: android master build on pixel
Change-Id: I2c004132a89e7f230690b4d26c98c3d5b2769f11
2017-07-10 10:44:58 +08:00
Jiyong Park
978a3cf1aa Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662
am: be8d64294c

Change-Id: Iad93bbe6e25ee63474cabbcab8214d04b33b91ab
2017-07-08 03:21:26 +00:00
Jiyong Park
be8d64294c Merge "Device-specific kernel headers are accessbile again"
am: 6f594fc662

Change-Id: Icffe772cc97a39fceb21e0a22a3776313bbefa1f
2017-07-08 03:18:56 +00:00
Jiyong Park
0c59dab590 Device-specific kernel headers are accessbile again
Device-specific kernel headers (TARGET_PROJECT_SYSTEM_INCLUDES) have
been added to the global include paths. However, since global include
paths are no longer provided when a lib is built for vendors, the
device-specific kernel headers becomes inaccessible. To solve this
problem, a pseudo header library 'device_kernel_headers' is defined
and it is added to all Android.mk defined lib/bins.

Also, in order to give this info to the soong world,
TARGET_PROJECT_SYSTEM_INCLUDES is exported as a new product config
DeviceKernelHeaders.

Bug: 62939405
Test: choosecombo to aosp_sailfish (or any other Pixel/Nexus targets)
BOARD_VNDK_VERSION=current m -j gralloc.msm8996 (or any other vendor
libs using vendor-specific kernel headers)

Change-Id: I3f0a2b893cc9352d6c13f3151e8834477d15c07b
2017-07-08 10:16:23 +09:00
Jiyong Park
8012c195f8 Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac
am: e51b222801

Change-Id: Ia279239c72e0cc5f0dc74959301ce4009c9172a4
2017-07-07 22:32:10 +00:00
Jiyong Park
e51b222801 Merge "Give TARGET_OUT_HEADERS to vendor modules"
am: c86c8502ac

Change-Id: I2d9ca861cbac74b6e14ee843717e41ddc855bd91
2017-07-07 22:30:08 +00:00
Treehugger Robot
c86c8502ac Merge "Give TARGET_OUT_HEADERS to vendor modules" 2017-07-07 22:25:00 +00:00
Colin Cross
e37a3c959a Use dx.jar directly
Use $(JAVA) to invoke dx.jar instead of the dx wrapper script.
Also allow the dx command line or the dx jar to be specified on
the command line.  Allows better dependencies on dx.jar, and
doesn't rely on having java on the path.

Bug: 62956999
Test: m -j checkbuild
Change-Id: I5f265132690ad28b3139954fea44eb0c4a43393a
2017-07-07 13:34:33 -07:00
Colin Cross
54c8cb91b8 Merge "Refactor prebuilt tools" am: bc45a33c93
am: 68016fc55f

Change-Id: I0e98ee6b74806c3bce15d9256a25378d2703358b
2017-07-07 20:26:47 +00:00
Colin Cross
68016fc55f Merge "Refactor prebuilt tools"
am: bc45a33c93

Change-Id: I689375970e4e4045d986b62a21f8ed7aa4e34a38
2017-07-07 20:24:15 +00:00
Colin Cross
bc45a33c93 Merge "Refactor prebuilt tools" 2017-07-07 20:19:24 +00:00
Ivan Lozano
046d1535fa Merge "Add integer_overflow sanitization build option." am: 05900230fd
am: 344306a4ac

Change-Id: I79cf44e4fc20d2dd1317bb0614f6a41d73202524
2017-07-07 20:15:00 +00:00
Ivan Lozano
344306a4ac Merge "Add integer_overflow sanitization build option."
am: 05900230fd

Change-Id: Id2dcea2042497ddcb7bb0b83eebee583fe3c13f8
2017-07-07 20:12:56 +00:00
Ivan Lozano
05900230fd Merge "Add integer_overflow sanitization build option." 2017-07-07 20:07:20 +00:00
Colin Cross
cd20d5980c Refactor prebuilt tools
Put the prebuilt and non-prebuilt tools selections into the two
clauses of an if block to simplify the next patch.

Test: m -j checkbuild
Change-Id: Idd01bc81a2b619f7fc23df7566a01b46598433a3
2017-07-07 18:16:28 +00:00
Przemyslaw Szczepaniak
a1847ffedf Merge "Enable stripping of java debug information when required." am: d659f806e5
am: 8c485b6b0c

Change-Id: If09c1fd1d8c30d1763ef7534e042ef4e3839d1f0
2017-07-07 15:33:11 +00:00
Przemyslaw Szczepaniak
8c485b6b0c Merge "Enable stripping of java debug information when required."
am: d659f806e5

Change-Id: I25facf64b176ae26db07d43cef92c522bf92e79a
2017-07-07 15:29:40 +00:00
Treehugger Robot
d659f806e5 Merge "Enable stripping of java debug information when required." 2017-07-07 15:24:32 +00:00