Commit Graph

37834 Commits

Author SHA1 Message Date
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
Dan Willemsen f734d09753 Merge "Stop using make wrapper around soong_ui" am: 80c05c518b
am: 757926d509

Change-Id: Ied7f4760c696277305b1d5b5f28c9bf6426bed21
2017-07-13 21:46:24 +00:00
Dan Willemsen 757926d509 Merge "Stop using make wrapper around soong_ui"
am: 80c05c518b

Change-Id: I74b69fd1c6f6fd2a9feb9807770577b523656fb8
2017-07-13 21:41:26 +00:00
Dan Willemsen 80c05c518b Merge "Stop using make wrapper around soong_ui" 2017-07-13 21:30:25 +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
Dan Willemsen d41ec5a3bc Stop using make wrapper around soong_ui
Instead of running make -> makeparallel -> soong_ui, just run soong_ui.
Soong_ui now handles user-facing argument parsing.

The user visible changes should only be:
* Most `make` command line options are no longer supported. Many didn't
do anything useful before this change either.
* `-j` is now implied, so not specifying it will default to full
parallelism instead of a single-threaded build.
* `make` debug messages are removed:
  make: Entering directory ...
  make: Leaving directory ...
  make: *** [run_soong_ui] Error 1

We still support the make workflow for users that don't use envsetup.sh
-- the build servers primarily, but also various helper scripts. These
will be converted later.

Test: in $TOP; make nothing
Test: in $TOP/bionic; make (runs real make, fails w/no makefile)
Test: in $TOP; m nothing
Test: in $TOP; mm nothing
Test: in $TOP; mma nothing
Test: in bionic/libc; m nothing
Test: in bionic/libc; mm
Test: in bionic/libc; mma
Test: in $TOP; mmm bionic/libc
Test: in $TOP; mmma bionic/libc
Test: in bionic; mmm libc
Test: in bionic; mmma libc
Test: set WITH_STATIC_ANALYZER=1, repeat above
Change-Id: Ic00190ac65a6aa924dad35d3d540c11d653b9c53
2017-07-12 17:16:49 -07: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
Treehugger Robot 1aa29599c6 Merge "fix: device_kernel_headers can't be found in the make world" 2017-07-12 20:49:12 +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 95a8c7e83f Merge "Support kernel modules in the odm image" 2017-07-11 02:04:00 +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
Treehugger Robot 6f594fc662 Merge "Device-specific kernel headers are accessbile again" 2017-07-08 03:12: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
Tao Bao 55625564c6 Merge "Track the AVB property name change." am: c45161536f
am: fcc2cf6c1e

Change-Id: I9bbed4c45961f2d3fa775b8b977ae58bbaae33ff
2017-07-07 23:35:43 +00:00
Tao Bao fcc2cf6c1e Merge "Track the AVB property name change."
am: c45161536f

Change-Id: If20f1f0880680b8da185d846a9e0f17139389b50
2017-07-07 23:33:41 +00:00
Treehugger Robot c45161536f Merge "Track the AVB property name change." 2017-07-07 23:28:30 +00: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 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
Andreas Gampe ce2236d92a Merge "Build: More tombstones in userdebug" am: 5378d0a7eb
am: 205958cb38

Change-Id: Ie5390a231825f31fa2c945d1bdba228266302804
2017-07-07 15:26:41 +00:00
Treehugger Robot d659f806e5 Merge "Enable stripping of java debug information when required." 2017-07-07 15:24:32 +00:00
Andreas Gampe 205958cb38 Merge "Build: More tombstones in userdebug"
am: 5378d0a7eb

Change-Id: I414a28b22f8677099ab61812995ca6715f8f2563
2017-07-07 15:23:48 +00:00
Treehugger Robot 5378d0a7eb Merge "Build: More tombstones in userdebug" 2017-07-07 15:17:03 +00:00
Andreas Gampe 427e49e0da Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

(cherry picked from commit 47e137f357)

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 23:54:14 -07:00
Dan Willemsen d2428079da Merge "Fix install location for vendor tests" am: af59c099c9
am: 113493d0c5

Change-Id: Ifec317f2b69ec0bb9a2cba04285f1c9ca6065270
2017-07-07 03:41:56 +00:00
Dan Willemsen 113493d0c5 Merge "Fix install location for vendor tests"
am: af59c099c9

Change-Id: Iaf694543edfce134bc7d4951e949a76f1175b542
2017-07-07 03:38:33 +00:00
Treehugger Robot af59c099c9 Merge "Fix install location for vendor tests" 2017-07-07 03:30:13 +00:00
Colin Cross 342ac430ef Merge "Increase max heap size for javac to 2GB." am: ae67473255 -s ours
am: c2b3797630  -s ours

Change-Id: Id68c31237b9c2836402448aa18cddbb107ed1dae
2017-07-07 02:09:03 +00:00
Colin Cross c2b3797630 Merge "Increase max heap size for javac to 2GB."
am: ae67473255  -s ours

Change-Id: I9e103af8edc458a138858032a0a691ed97d1a4ad
2017-07-07 02:06:01 +00:00
Treehugger Robot ae67473255 Merge "Increase max heap size for javac to 2GB." 2017-07-07 01:57:16 +00:00
Bryan Eyler 0602eacffe Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a
am: 1558db6a87

Change-Id: I01ebe1958d0a337d7875c171c7f680560ef240ea
2017-07-07 01:35:50 +00:00
Bryan Eyler 1558db6a87 Merge "Re-compute DX command if it changes for PDK."
am: 7edc11830a

Change-Id: Ied18008a334db388efe5d396bc3a7186f6c7e327
2017-07-07 01:32:49 +00:00
Treehugger Robot 7edc11830a Merge "Re-compute DX command if it changes for PDK." 2017-07-07 01:22:36 +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