Commit graph

38365 commits

Author SHA1 Message Date
Tao Bao
f7f27b9002 Merge "Add the missing 'import stat' line." into oc-dr1-dev
am: d43ab80c75

Change-Id: I5d2712c53e9284b96a80ca66cc2b8361e27d3176
2017-07-12 22:21:55 +00:00
Tao Bao
d43ab80c75 Merge "Add the missing 'import stat' line." into oc-dr1-dev 2017-07-12 22:18:18 +00:00
Jiyong Park
91dfb75cb4 Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6 am: 240f1d5ffe
am: e6cab73dcd

Change-Id: I192db2c4f76782f3df33287f5f5a98c15a1653a0
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

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
Tao Bao
9fdd00f682 Add the missing 'import stat' line.
Accidentally broken by the cherry-pick in commit
f829b40c48 - the original CL in oc-dev
doesn't require the 'import stat' line.

Bug: 63629728
Test: `pylint --rcfile=pylintrc sign_target_files_apks.py`
Test: Successfully sign a build with sign_target_files_apks.py.
Change-Id: I94be613fb2219597148c4339ac33fc93d0cdae47
2017-07-12 12:01:43 -07: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
Sundong Ahn
a590658660 Merge "configstore: remove configstore 1.1" into oc-dr1-dev
am: a44eece105  -s ours

Change-Id: I4d310b55a94074ec62e8664acd06dda92a631fd8
2017-07-12 02:25:34 +00:00
Sundong Ahn
effdf27a73 configstore: remove configstore 1.1
am: bbab8007c6  -s ours

Change-Id: Id41875e0611b4f5d65f756b8f26ae434ca9520bf
2017-07-12 02:23:22 +00:00
TreeHugger Robot
a44eece105 Merge "configstore: remove configstore 1.1" into oc-dr1-dev 2017-07-12 02:18:17 +00:00
Howard Chen
fd3340ee6f Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0
am: e4b1bdaa9e

Change-Id: I70674dc5b25aa224b56df45ab526fc5addfe9846
2017-07-11 02:14:55 +00: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
Tao Bao
f04c8f1566 Track the AVB property name change.
am: 48ae05ea77

Change-Id: I43a5e2c7391752e32bd279de4ee48088d9c5932c
2017-07-10 17:29:19 +00:00
Sundong Ahn
bbab8007c6 configstore: remove configstore 1.1
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in dr1 will be down
revisioned to 1.0.

Bug: 63440035
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I21861448a5d607383b617f2f85bd378013e64090
2017-07-10 15:05:32 +09: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
d597e27485 Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c
am: 978a3cf1aa

Change-Id: I4c89980bb4678a3ca0b108dc0920c57014cf91d7
2017-07-08 03:23:26 +00: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
7cbc3fcefe Merge "Track the AVB property name change." am: c45161536f am: fcc2cf6c1e
am: 55625564c6

Change-Id: I38487d4fd4ef9925d8d5758f79de6eb73d095194
2017-07-07 23:37:41 +00: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
8735a66b27 Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801
am: 8012c195f8

Change-Id: I30865a364c14438668d2ecd1bcbd68c735eeb24d
2017-07-07 22:34:38 +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
Tao Bao
48ae05ea77 Track the AVB property name change.
system_avb_hashtree_enable has been renamed to
avb_system_hashtree_enable in commit
3e599ead66. 'care_map.txt' is missing due
to the change.

Bug: 63142730
Test: `m dist` and check IMAGES/care_map.txt exists in target_files zip.
Change-Id: I60c269b41df844b50353d357bf67c20f15548642
(cherry picked from commit 3f72176da0)
2017-07-07 15:02:37 -07:00
Colin Cross
4ef344a5dd Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f
am: 54c8cb91b8

Change-Id: I0c8cd66738b37aabc3191449a99dc781b6132225
2017-07-07 20:29:19 +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
4e684f5adb Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac
am: 046d1535fa

Change-Id: I508544155ee260ef6249676910475ca7808ca5dc
2017-07-07 20:17:30 +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
07f315d91d Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c
am: a1847ffedf

Change-Id: I085608da575941de51eea8bc8deb7067a3673dd3
2017-07-07 15:56:22 +00:00
Andreas Gampe
04d270e9c7 Merge "Build: More tombstones in userdebug" am: 5378d0a7eb am: 205958cb38
am: ce2236d92a

Change-Id: I61c0e3bf530aee55ab9797c7a389413a7a6db8c9
2017-07-07 15:56:05 +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
0b24deb839 Build: More tombstones in userdebug
am: 47e137f357

Change-Id: I6dc83edb29170e1f5a3c70d823d5c3a8d0089a7e
2017-07-07 06:57:16 +00:00