Colin Cross
3f273622f4
Merge "Revert "Use dx.jar directly"" am: c7e3e962f8
...
am: 4cea760106
2017-07-18 07:20:06 +00:00
Colin Cross
4cea760106
Merge "Revert "Use dx.jar directly""
...
am: c7e3e962f8
2017-07-18 07:14:26 +00:00
Treehugger Robot
c7e3e962f8
Merge "Revert "Use dx.jar directly""
2017-07-18 07:08:19 +00:00
Colin Cross
e44e75aa89
Revert "Use dx.jar directly"
...
This reverts commit e37a3c959a
2017-07-18 05:22:59 +00:00
Colin Cross
5ac450547f
Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41 am: 5cf757bb85
...
am: 5a6cc2bda2
2017-07-17 20:58:00 +00:00
Jeff Gaston
c1d097ccab
Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3 am: 7ce0d9c1e7
...
am: a72da88c31
2017-07-17 20:55:14 +00:00
Colin Cross
5a6cc2bda2
Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41
...
am: 5cf757bb85
2017-07-17 20:53:12 +00:00
Jeff Gaston
a72da88c31
Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3
...
am: 7ce0d9c1e7
2017-07-17 20:52:40 +00:00
Colin Cross
5cf757bb85
Merge "Use dx.jar directly" am: c68434c971
...
am: 4828fcad41
2017-07-17 20:49:10 +00:00
Jeff Gaston
7ce0d9c1e7
Merge "Update to latest jacoco usage" am: 483fae7430
...
am: 6264b662f3
2017-07-17 20:48:40 +00:00
Colin Cross
4828fcad41
Merge "Use dx.jar directly"
...
am: c68434c971
2017-07-17 20:45:31 +00:00
Jeff Gaston
6264b662f3
Merge "Update to latest jacoco usage"
...
am: 483fae7430
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
Dan Willemsen
545c356675
Merge "Enable missing dependency checks"
2017-07-15 04:18:34 +00:00
Bowgo Tsai
1799d360b5
Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740 am: 9a797706b5
...
am: 5cf6551455
2017-07-15 00:10:39 +00:00
Bowgo Tsai
5cf6551455
Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740
...
am: 9a797706b5
2017-07-15 00:06:34 +00:00
Bowgo Tsai
9a797706b5
Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3
...
am: bd91ac7740
2017-07-15 00:02:03 +00:00
Bowgo Tsai
bd91ac7740
Merge "custom_images: support verity fec (forward error correction)"
...
am: abf553c9d3
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
e79e9c9dfd
Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 am: a07a04c737 am: 4b53a17756
...
am: a4caab580c
2017-07-14 23:38:32 +00:00
Tianjie Xu
a4caab580c
Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 am: a07a04c737
...
am: 4b53a17756
2017-07-14 23:34:39 +00:00
Tianjie Xu
4b53a17756
Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1
...
am: a07a04c737
2017-07-14 23:30:32 +00:00
Tianjie Xu
a07a04c737
Merge "Generate brotli compressed {}.new.dat for full OTA"
...
am: 1b28eca1a1
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
b4b33a6d67
Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0 am: 453fcba264
...
am: dcd3182250
2017-07-14 23:21:48 +00:00
Colin Cross
dcd3182250
Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0
...
am: 453fcba264
2017-07-14 23:17:30 +00:00
Colin Cross
453fcba264
Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed
...
am: 06f8dec6e0
2017-07-14 23:13:31 +00:00
Colin Cross
06f8dec6e0
Merge "Fix LOCAL_JAR_PROCESSOR dependency"
...
am: 126e625fed
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
Colin Cross
1931750940
Use java prebuilts
...
Point the make java variables at JDK prebuilts in
prebuilts/jdk/jdk8, add them to the path, and clean up
some old overrides.
Bug: 62956999
Test: m -j checkbuild
Change-Id: Ibbeb30fab96e45aedd5bb6d710d1170f85789982
2017-07-14 14:18:53 -07: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
fcec4ec8d7
Merge "Define paths for vendor native tests." am: f4f8e91a5d am: c9bc937d6d am: 4e3bdda4e9
...
am: 215b687f76
2017-07-14 18:52:13 +00:00
Steven Moreland
215b687f76
Merge "Define paths for vendor native tests." am: f4f8e91a5d am: c9bc937d6d
...
am: 4e3bdda4e9
2017-07-14 18:49:12 +00:00
Steven Moreland
4e3bdda4e9
Merge "Define paths for vendor native tests." am: f4f8e91a5d
...
am: c9bc937d6d
2017-07-14 18:45:42 +00:00
Steven Moreland
c9bc937d6d
Merge "Define paths for vendor native tests."
...
am: f4f8e91a5d
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
3b6c3ca4a7
Merge "Don't allow JNI headers for vendors" am: b253e8e854 am: 9e89245a2c am: 9fc093f932
...
am: 59d5727193
2017-07-14 03:49:49 +00:00
Jiyong Park
59d5727193
Merge "Don't allow JNI headers for vendors" am: b253e8e854 am: 9e89245a2c
...
am: 9fc093f932
2017-07-14 03:46:20 +00:00
Jiyong Park
9fc093f932
Merge "Don't allow JNI headers for vendors" am: b253e8e854
...
am: 9e89245a2c
2017-07-14 03:42:49 +00:00
Jiyong Park
9e89245a2c
Merge "Don't allow JNI headers for vendors"
...
am: b253e8e854
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
c32a968605
Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6 am: 240f1d5ffe am: e6cab73dcd
...
am: 91dfb75cb4
2017-07-12 21:01:52 +00:00
Jiyong Park
91dfb75cb4
Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6 am: 240f1d5ffe
...
am: e6cab73dcd
2017-07-12 20:59:23 +00:00
Jiyong Park
e6cab73dcd
Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6
...
am: 240f1d5ffe
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
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
133a64829e
Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0 am: e4b1bdaa9e
...
am: fd3340ee6f
2017-07-11 02:17:27 +00:00
Howard Chen
fd3340ee6f
Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0
...
am: e4b1bdaa9e
2017-07-11 02:14:55 +00:00
Howard Chen
e4b1bdaa9e
Merge "Support kernel modules in the odm image" am: 95a8c7e83f
...
am: 1b0da968a0
2017-07-11 02:12:26 +00:00
Howard Chen
1b0da968a0
Merge "Support kernel modules in the odm image"
...
am: 95a8c7e83f
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
a23d4bc84e
Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c am: 978a3cf1aa
...
am: d597e27485
2017-07-08 03:26:00 +00:00
Jiyong Park
d597e27485
Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c
...
am: 978a3cf1aa
2017-07-08 03:23:26 +00:00
Jiyong Park
978a3cf1aa
Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662
...
am: be8d64294c
2017-07-08 03:21:26 +00:00
Jiyong Park
be8d64294c
Merge "Device-specific kernel headers are accessbile again"
...
am: 6f594fc662
2017-07-08 03:18:56 +00:00
Mathieu Chartier
7c826ad3a3
Merge "Add support for using profiles for boot images"
2017-07-08 01:42:51 +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
Mathieu Chartier
77226f6333
Add support for using profiles for boot images
...
Added two product flags:
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
If PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE is enabled (default false), a
art profile is used to create the preopted boot image. This profile
is also passed to the runtime in AndroidRuntime.cpp.
The profile is created from the
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION variable that defaults
to "frameworks/base/boot-image-profile.txt".
Bug: 37966211
Test: make and flash
Change-Id: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885
2017-07-07 16:48:02 -07:00
Jiyong Park
c83015fbc0
Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801 am: 8012c195f8
...
am: 8735a66b27
2017-07-07 22:37:09 +00:00
Jiyong Park
8735a66b27
Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801
...
am: 8012c195f8
2017-07-07 22:34:38 +00:00
Jiyong Park
8012c195f8
Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac
...
am: e51b222801
2017-07-07 22:32:10 +00:00
Jiyong Park
e51b222801
Merge "Give TARGET_OUT_HEADERS to vendor modules"
...
am: c86c8502ac
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
11a2206f42
Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f am: 54c8cb91b8
...
am: 4ef344a5dd
2017-07-07 20:31:46 +00:00
Colin Cross
4ef344a5dd
Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f
...
am: 54c8cb91b8
2017-07-07 20:29:19 +00:00
Colin Cross
54c8cb91b8
Merge "Refactor prebuilt tools" am: bc45a33c93
...
am: 68016fc55f
2017-07-07 20:26:47 +00:00
Colin Cross
68016fc55f
Merge "Refactor prebuilt tools"
...
am: bc45a33c93
2017-07-07 20:24:15 +00:00
Ivan Lozano
2228f3682c
Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac am: 046d1535fa
...
am: 4e684f5adb
2017-07-07 20:21:58 +00:00
Colin Cross
bc45a33c93
Merge "Refactor prebuilt tools"
2017-07-07 20:19:24 +00:00
Ivan Lozano
4e684f5adb
Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac
...
am: 046d1535fa
2017-07-07 20:17:30 +00:00
Ivan Lozano
046d1535fa
Merge "Add integer_overflow sanitization build option." am: 05900230fd
...
am: 344306a4ac
2017-07-07 20:15:00 +00:00
Ivan Lozano
344306a4ac
Merge "Add integer_overflow sanitization build option."
...
am: 05900230fd
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
1872eb8b9d
Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c am: a1847ffedf
...
am: 07f315d91d
2017-07-07 16:03:58 +00:00
Przemyslaw Szczepaniak
07f315d91d
Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c
...
am: a1847ffedf
2017-07-07 15:56:22 +00:00
Przemyslaw Szczepaniak
a1847ffedf
Merge "Enable stripping of java debug information when required." am: d659f806e5
...
am: 8c485b6b0c
2017-07-07 15:33:11 +00:00
Przemyslaw Szczepaniak
8c485b6b0c
Merge "Enable stripping of java debug information when required."
...
am: d659f806e5
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
Treehugger Robot
ae67473255
Merge "Increase max heap size for javac to 2GB."
2017-07-07 01:57:16 +00:00
Bryan Eyler
3458b5f5a9
Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a am: 1558db6a87
...
am: 0602eacffe
2017-07-07 01:38:51 +00:00
Bryan Eyler
0602eacffe
Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a
...
am: 1558db6a87
2017-07-07 01:35:50 +00:00
Bryan Eyler
1558db6a87
Merge "Re-compute DX command if it changes for PDK."
...
am: 7edc11830a
2017-07-07 01:32:49 +00:00
Ivan Lozano
4a363734b3
Add integer_overflow sanitization build option.
...
Adds the SANITIZE_TARGET=integer_overflow build option to apply signed and
unsigned integer overflow sanitization globally. This implements the
Make side of the build option.
A LOCAL_SANITIZE_BLACKLIST variable is added to allow blacklists to be
defined in make files, mirroring similar functionality provided in Soong.
An additional build option is provided to control whether or not to run
in diagnostics mode, controlled by SANITIZE_TARGET_DIAG. This works the
same way that SANITIZE_TARGET does and currently only supports
'integer_overflow' as an option.
Bug: 30969751
Test: Building with and without the new flags, device boot-up, tested
various permutations of controlling the new flags from build files.
Change-Id: Iacc47e196f21aa1edff5b406bfbc564b5f4e42bd
2017-07-06 18:21:37 -07:00
Bryan Eyler
d4794315ff
Re-compute DX command if it changes for PDK.
...
Bug 62360631
Tested build of PDK.
Test: builds
Change-Id: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
Merged-In: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
(cherry picked from commit af4bde4239
2017-07-06 16:22:01 -07:00
Colin Cross
a12d38a721
Increase max heap size for javac to 2GB.
...
Compiling Dialer requires increasing the javac heap size above
1GB, probably due to the extensive use of annotation processors.
Increase it to 2GB.
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e
Merged-In: I4dd3759a98ea915469e69f563dc49be8a25d518e
(cherry picked from commit 0e785c79b8
2017-07-06 16:13:00 -07:00
Przemyslaw Szczepaniak
2e81b3c49f
Enable stripping of java debug information when required.
...
We're removing LocalVariableType / LocalVariableType in order to
save space. Enabling stripping reduces AOSP image size save
by ~12MB.
Bug: 38224820
Test: CtsLibcoreTestCases
Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
2017-07-06 08:31:14 +00:00
Howard Chen
6cf0960922
Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e am: fd380f20cb am: 0b2aebab08
...
am: f07747f71f
2017-07-06 04:18:08 +00:00
Howard Chen
f07747f71f
Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e am: fd380f20cb
...
am: 0b2aebab08
2017-07-06 03:55:24 +00:00
Howard Chen
0b2aebab08
Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e
...
am: fd380f20cb
2017-07-06 03:52:53 +00:00
Howard Chen
fd380f20cb
Merge "Add a make maco to convert string to upper case"
...
am: 8eff2d7c8e
2017-07-06 03:50:54 +00:00
Howard Chen
8eff2d7c8e
Merge "Add a make maco to convert string to upper case"
2017-07-06 03:46:07 +00:00
Bowgo Tsai
412138338e
Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39
...
am: 95202bcba6
2017-07-06 01:00:41 +00:00
