Commit Graph

34000 Commits

Author SHA1 Message Date
Andreas Gampe
88757661d5 Merge changes from topic 'app_process_sanitized_binaries'
am: de24e6198e

Change-Id: Ie077774c7816e7bf19c4474e9fa36824e10d58d4
2016-12-01 00:09:03 +00:00
Andreas Gampe
3c326183ca Build: Add asanwrapper in SANITIZE_LITE
am: eee31511f7

Change-Id: I2fda3c98543296418b7c4741e8425f1ab35f7fb1
2016-12-01 00:06:26 +00:00
Andreas Gampe
2ceff14391 Build: Add sanitized app_process
am: a35d92e431

Change-Id: Idc10fa334820dab5de1a697092e4c14fb6023425
2016-12-01 00:06:20 +00:00
Pirama Arumuga Nainar
f3121cd73f Do not *directly* package libbcc.so
Bug: http://b/28866258

Remove libbcc.so from the list of directly packaged modules.  64-bit
libbcc.so gets included as a dependency for the bcc executable (which is
a required package).  32-bit libbcc.so is no longer necessary on 64-bit
devices.

This change also removes 32-bit libLLVM.so from a 64-bit system image
(leading to a 13M reduction in Angler's system image on AOSP) and a
considerable reduction in build time.

Test: - Build all topics in this CL
      - RsTest (including the 32-bit ABI) and CTS tests pass on x86 and
        x86_64 emulators and Angler.

Change-Id: I10f07e322a615f37d6967b7c938635f544ddceff
2016-11-30 15:45:25 -08:00
Rakesh Iyer
1492f7a106 Merge "Updated static_java_library.mk to support proguard options." 2016-11-30 23:04:17 +00:00
Marco Nelissen
7824073a36 DO NOT MERGE increase generic_mips system partition
Increase system partition from 750MB to 768MB to fix
sdk_google_phone_mips build.

Change-Id: I35a60767a3dea7b1ce3c97246f4a038c98f5cb06
2016-11-30 13:14:13 -08:00
Treehugger Robot
de24e6198e Merge changes from topic 'app_process_sanitized_binaries'
* changes:
  Build: Add asanwrapper in SANITIZE_LITE
  Build: Add sanitized app_process
2016-11-30 21:00:56 +00:00
Andreas Gampe
eee31511f7 Build: Add asanwrapper in SANITIZE_LITE
Add asanwrapper helper binary to PRODUCT_PACKAGES when building with
SANITIZE_LITE=true.

Bug: 33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asanwrapper
Change-Id: Ic4d8973b9e9ddfd9ef8663735bf5f70d8f9f70e1
2016-11-30 10:20:20 -08:00
Paul Duffin
6470f4fa99 Replace core-junit with legacy-test
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases

Bug: 30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
2016-11-30 13:50:56 +00:00
Andreas Gampe
a35d92e431 Build: Add sanitized app_process
Add sanitized app_process module to PRODUCT_PACKAGES when building
with SANITIZE_LITE=true

Bug: 33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asan
Change-Id: Ic67976f1b897b638d569ec6f42d5a8d59f8a9285
2016-11-29 19:22:01 -08:00
Andreas Gampe
c54a03b944 Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a am: f606cc1677 am: 724d458547
am: 8573639479

Change-Id: I57a2ee2251e998333e3dab191ec3f125f46ac4f8
2016-11-30 01:03:39 +00:00
Andreas Gampe
8573639479 Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a am: f606cc1677
am: 724d458547

Change-Id: I5544d2c50b27c621cb1eeb9b059145d1105625d9
2016-11-30 00:58:39 +00:00
Andreas Gampe
724d458547 Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a
am: f606cc1677

Change-Id: I98a2c0a30012b1649d21a780f9eb22d30bcb0655
2016-11-30 00:53:09 +00:00
Andreas Gampe
f606cc1677 Merge "Revert "Build: Bring back SDK dependencies""
am: 2bbeae7f8a

Change-Id: I9560d6a8f9971db89c87499b2e177bd0bb921cff
2016-11-30 00:48:39 +00:00
Treehugger Robot
2bbeae7f8a Merge "Revert "Build: Bring back SDK dependencies"" 2016-11-30 00:39:34 +00:00
Eric Laurent
8db62f13f8 Merge "remove legacy audio policy manager" 2016-11-29 21:04:49 +00:00
Dan Willemsen
30c4ac14d3 Merge changes from topic 'basic_vndk' am: e69f15c9dc am: 474bba8831 am: 4c6efa0947
am: c9685e61ac

Change-Id: I01970875980da36fc278b10739edd6352f34d48c
2016-11-29 20:59:22 +00:00
Dan Willemsen
2c412e9c92 Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 am: dc556b4bc0 am: 6e0c0da5dc
am: 7dd10c1085

Change-Id: I9d7b9721ae471c5f2a57b2ff49006b701fdfb49b
2016-11-29 20:59:13 +00:00
Dan Willemsen
a45af9e63c Add basic VNDK support in Make am: bab0fa6928 am: 323efd3035 am: 2e300cdb70
am: f987fa38a2

Change-Id: I4e43bb2127e646532d67a9d7350b01c84f51734c
2016-11-29 20:59:06 +00:00
Dan Willemsen
be6152d51a Remove GLOBAL_LD_DIRS am: e5836c4bb0 am: 28cf7d49ab am: 4d20d14143
am: 0351f5c988

Change-Id: I5a9bb51b92e02c8811b68bf043346ed6e72c5a1b
2016-11-29 20:58:58 +00:00
Dan Willemsen
c9685e61ac Merge changes from topic 'basic_vndk' am: e69f15c9dc am: 474bba8831
am: 4c6efa0947

Change-Id: I5eb1e7a3ffe1af25c38781730e6b927ba92643fe
2016-11-29 20:53:49 +00:00
Dan Willemsen
7dd10c1085 Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7 am: dc556b4bc0
am: 6e0c0da5dc

Change-Id: I31dc4a8648a8183f553b780d14c40114358a8087
2016-11-29 20:53:41 +00:00
Dan Willemsen
f987fa38a2 Add basic VNDK support in Make am: bab0fa6928 am: 323efd3035
am: 2e300cdb70

Change-Id: Ifac610b8456a4d3093a350d9d5dd11d07f4ec776
2016-11-29 20:53:34 +00:00
Dan Willemsen
0351f5c988 Remove GLOBAL_LD_DIRS am: e5836c4bb0 am: 28cf7d49ab
am: 4d20d14143

Change-Id: Idbe7af62a70df03b6070f870646107b9c1c4636c
2016-11-29 20:53:27 +00:00
Dan Willemsen
4c6efa0947 Merge changes from topic 'basic_vndk' am: e69f15c9dc
am: 474bba8831

Change-Id: I20781d5c2dabfd17f1bdff90c05181e226212b16
2016-11-29 20:47:46 +00:00
Dan Willemsen
6e0c0da5dc Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7
am: dc556b4bc0

Change-Id: I332c1128472baef57367bbf7be25ed0338a8f4d2
2016-11-29 20:47:40 +00:00
Dan Willemsen
2e300cdb70 Add basic VNDK support in Make am: bab0fa6928
am: 323efd3035

Change-Id: I6a3f89a810782b965152a415947da26b930fc408
2016-11-29 20:47:33 +00:00
Dan Willemsen
4d20d14143 Remove GLOBAL_LD_DIRS am: e5836c4bb0
am: 28cf7d49ab

Change-Id: I35109a1e1ec6fb546da0e4cf439e670d4f8c8cd0
2016-11-29 20:47:27 +00:00
Dan Willemsen
474bba8831 Merge changes from topic 'basic_vndk'
am: e69f15c9dc

Change-Id: Idf95a23c4b1341145f9e39364235413c82f659ac
2016-11-29 20:42:40 +00:00
Dan Willemsen
dc556b4bc0 Prohibit host modules from using LOCAL_COPY_HEADERS
am: 6e51ef61a7

Change-Id: Id7c80e4dba5a505a04ce47d459c0a525debc4d53
2016-11-29 20:42:37 +00:00
Dan Willemsen
323efd3035 Add basic VNDK support in Make
am: bab0fa6928

Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92
2016-11-29 20:42:32 +00:00
Dan Willemsen
28cf7d49ab Remove GLOBAL_LD_DIRS
am: e5836c4bb0

Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
2016-11-29 20:42:26 +00:00
Treehugger Robot
e69f15c9dc Merge changes from topic 'basic_vndk'
* changes:
  Prohibit host modules from using LOCAL_COPY_HEADERS
  Add basic VNDK support in Make
  Remove GLOBAL_LD_DIRS
2016-11-29 20:36:04 +00:00
Colin Cross
fe10963496 Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES
Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2
causes a warning:
build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets

Only call find-subdir-assets if my_res_dir is not empty.

Also improve the warning message to make it easier to find the module
that caused it.

Test: m -j
Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317
2016-11-29 11:12:56 -08:00
Eric Laurent
758ef878dd remove legacy audio policy manager
Test: make angler-eng
Change-Id: I396741f90e17345a77d169f972cfb017ec4965a3
2016-11-28 17:58:33 -08:00
Tao Bao
60f2663649 Merge "Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45 am: 1eb115c6e8" into nyc-mr2-dev-plus-aosp
am: 222b634005

Change-Id: I8c0c4f4344413e9efaff70d0b0f049f2aabde955
2016-11-29 00:37:24 +00:00
Tao Bao
817d4605ef Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45 am: 1eb115c6e8
am: 1ce853c269

Change-Id: Id0ebcb235cd06c85813aa72d59964b9210f50385
2016-11-29 00:37:22 +00:00
Tao Bao
eecafaa82d Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45 am: 2696b7107c
am: 5901453c62

Change-Id: I72d973915ebb263471bb113f4ff7031b9e452170
2016-11-29 00:37:08 +00:00
Android Build Merger (Role)
222b634005 Merge "Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45 am: 1eb115c6e8" into nyc-mr2-dev-plus-aosp 2016-11-29 00:32:51 +00:00
Tao Bao
1ce853c269 Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45
am: 1eb115c6e8

Change-Id: I3fcddc86fe6b9411dc7d5f3f436b9ad0306ac359
2016-11-29 00:32:37 +00:00
Tao Bao
5901453c62 Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9 am: 41fd473e45
am: 2696b7107c

Change-Id: Ib2fb27f2d23bc2a7c2df8f7f73e9df08a34ccdcb
2016-11-29 00:32:37 +00:00
Tao Bao
1eb115c6e8 Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9
am: 41fd473e45

Change-Id: I096bab71bc1bdf3cfd9e8ede276504b65313af9c
2016-11-29 00:28:07 +00:00
Tao Bao
2696b7107c Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9
am: 41fd473e45

Change-Id: I0cdeb8e136a46483af2b94adb2171a50c3a20c00
2016-11-29 00:28:06 +00:00
Tao Bao
41fd473e45 Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d
am: 7981d953a9

Change-Id: I8ccc7c02e2c577293b7bfc29759b79f1908863d8
2016-11-29 00:24:05 +00:00
Tao Bao
7981d953a9 Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c
am: ad8924117d

Change-Id: Ia766ef6038434d8435a81f7e921de2936fd33411
2016-11-29 00:19:36 +00:00
Zheng Zhang
6662e8addf Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev am: 28b96d1470 am: c898fcdef0
am: 7f479f73d7  -s ours

Change-Id: If56f247d354804d85a8928b7de72da98672b1775
2016-11-29 00:15:15 +00:00
Sami Tolvanen
0cd31bbf86 DO NOT MERGE: build_image: add padding to match partition size am: 9a675c94d3 -s ours am: 0badc6ba69
am: feb63322f2  -s ours

Change-Id: I64161322dc2ca4ee3250d2444e15028d76348272
2016-11-29 00:15:08 +00:00
Tao Bao
ad8924117d Makefile: Pack verity_verifier into otatools.zip.
am: 7bb3aff71c

Change-Id: Iffb447dea7f4b227edf5311229ea0902bb4b25f5
2016-11-29 00:15:05 +00:00
Zheng Zhang
7f479f73d7 Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev am: 28b96d1470
am: c898fcdef0

Change-Id: Ia343d6dba512a078c2bd4ba7148c11fb270b128b
2016-11-29 00:10:45 +00:00
Sami Tolvanen
feb63322f2 DO NOT MERGE: build_image: add padding to match partition size am: 9a675c94d3 -s ours
am: 0badc6ba69

Change-Id: I07559756657e09520626e34b3f46b410d423bc4e
2016-11-29 00:10:39 +00:00