Commit Graph

5581 Commits

Author SHA1 Message Date
Pirama Arumuga Nainar eaffec54ba Merge "Re-enable -Wunknown-warning-option" am: cc178b3e78 am: e25bbfdc04
am: e5d53e9cdf

Change-Id: Id4b71f0e0372987102e689653de9fefac21721d5
2017-11-14 11:22:38 +00:00
Pirama Arumuga Nainar e5d53e9cdf Merge "Re-enable -Wunknown-warning-option" am: cc178b3e78
am: e25bbfdc04

Change-Id: I7fa6114b5d63b52e291fcfc7ee02afa1a070a035
2017-11-14 01:28:44 +00:00
Pirama Arumuga Nainar e25bbfdc04 Merge "Re-enable -Wunknown-warning-option"
am: cc178b3e78

Change-Id: I14ba3bb5577ad4379271867c91ac2a6a3b00be23
2017-11-11 13:34:42 +00:00
Treehugger Robot cc178b3e78 Merge "Re-enable -Wunknown-warning-option" 2017-11-11 13:29:23 +00:00
Colin Cross 72db101636 Merge "Add presingletons" am: 62255a7687 am: a0f01cda41
am: 127149ea12

Change-Id: I81be21021cf4e46d68d928552f129b60017e705f
2017-11-11 01:04:34 +00:00
Colin Cross 127149ea12 Merge "Add presingletons" am: 62255a7687
am: a0f01cda41

Change-Id: I31abd3322ce459173d95e0bfd24951ac75689540
2017-11-11 01:02:03 +00:00
Colin Cross a0f01cda41 Merge "Add presingletons"
am: 62255a7687

Change-Id: Icdaa84994e19cc439ec92392672b0597840f509c
2017-11-11 01:00:35 +00:00
Colin Cross 62255a7687 Merge "Add presingletons" 2017-11-11 00:53:53 +00:00
Dan Willemsen 44df8d97a5 Merge "pom2mk: Allow setting LOCAL_SDK_VERSION" am: dbe8b78a5d am: 1bf562160b
am: 2409facf73

Change-Id: Ib77a2e8bf77afe9b19c26316dd90ae45b877f080
2017-11-11 00:03:01 +00:00
Dan Willemsen 2409facf73 Merge "pom2mk: Allow setting LOCAL_SDK_VERSION" am: dbe8b78a5d
am: 1bf562160b

Change-Id: If7f05e7956946d0db6a7361c83577ce56a87a181
2017-11-11 00:00:58 +00:00
Dan Willemsen 1bf562160b Merge "pom2mk: Allow setting LOCAL_SDK_VERSION"
am: dbe8b78a5d

Change-Id: I5922bc8bdfbd680c3d750ea1f102e8a53e219af3
2017-11-10 23:58:59 +00:00
Treehugger Robot dbe8b78a5d Merge "pom2mk: Allow setting LOCAL_SDK_VERSION" 2017-11-10 23:53:44 +00:00
Colin Cross 40175e1ed1 Merge "Add OncePer.Get()" am: a0059915d1 am: 2717c7cf3c
am: e9e395f787

Change-Id: I77c6517c6e2a8d1dc484dd1358dc867c240d6686
2017-11-10 22:55:56 +00:00
Colin Cross e9e395f787 Merge "Add OncePer.Get()" am: a0059915d1
am: 2717c7cf3c

Change-Id: Id1ecf0ebb6359b1458dc23733c6b09309f6380be
2017-11-10 22:53:59 +00:00
Colin Cross 2717c7cf3c Merge "Add OncePer.Get()"
am: a0059915d1

Change-Id: I76c0305d228b939e1065e9905e1aae9865fff8db
2017-11-10 22:51:54 +00:00
Colin Cross a0059915d1 Merge "Add OncePer.Get()" 2017-11-10 22:48:38 +00:00
Dan Willemsen 15a8e793f3 pom2mk: Allow setting LOCAL_SDK_VERSION
For unbundled builds, LOCAL_SDK_VERSION needs to be set, otherwise we'll
try to use frameworks-res, which isn't available.

Bug: 64723465
Test: Use with prebuilts/sdk/update_current.py
Change-Id: If5e1233b4bcb09b3d0e2251e8dd1a8ecfc87eb19
2017-11-10 14:03:48 -08:00
Pirama Arumuga Nainar 4c0e1bf4e0 Re-enable -Wunknown-warning-option
Bug: http://b/68236396

This warning only needs to be enabled for frameworks/base/core/jni.

Test: Build the topic
Change-Id: I9f6aab2045f135d691696f9fd461c895a5aadb38
2017-11-10 13:54:47 -08:00
Nan Zhang 7f6bbf2330 Change bool, and string properties to *bool, and *string for java, python, and genrule. am: ea568a4a24 am: dbfab2395a
am: 0eff117e53

Change-Id: Ib867eef6ce80ba6b81fd6aaf66f1dab1b26e40b8
2017-11-10 01:24:32 +00:00
Nan Zhang 0eff117e53 Change bool, and string properties to *bool, and *string for java, python, and genrule. am: ea568a4a24
am: dbfab2395a

Change-Id: Ief14b766484d742d94e4049f74b522bf224b5987
2017-11-10 01:03:57 +00:00
Nan Zhang dbfab2395a Change bool, and string properties to *bool, and *string for java, python, and genrule.
am: ea568a4a24

Change-Id: I8ab9299b2c8a5ce5f4fb36b7c8eb7dfb248f2582
2017-11-10 00:51:11 +00:00
Nan Zhang ea568a4a24 Change bool, and string properties to *bool, and *string for java,
python, and genrule.

Test: m -j checkbuild
Bug: b/68853585
Change-Id: Ic9a8083818e920dc399a4b00841e2aa496f70faa
2017-11-08 21:25:40 -08:00
Jeff Gaston ce29f4ae9f Merge "Pass results of Finder into Blueprint" am: 99a5635733 am: 01452934fb
am: 8babc15d24

Change-Id: I6e6647ec2ab69a9c561f8582640dbec5671da635
2017-11-09 03:16:56 +00:00
Jeff Gaston 8babc15d24 Merge "Pass results of Finder into Blueprint" am: 99a5635733
am: 01452934fb

Change-Id: I975717dfc1e3f8d7a7a1417d53ae957acdf7c629
2017-11-09 03:14:30 +00:00
Jeff Gaston 01452934fb Merge "Pass results of Finder into Blueprint"
am: 99a5635733

Change-Id: I135000b44c854b173382fd0b1959c00dc026e054
2017-11-09 03:13:00 +00:00
Vishwath Mohan 4045457e65 CFI include/exclude path support (Soong) am: 1fa3ac552d am: fbfc32ea1b
am: 3caa24c44c

Change-Id: I25301cf069f730dcf32465cdb6dec7be65b3c9b7
2017-11-09 03:12:54 +00:00
Vishwath Mohan 3caa24c44c CFI include/exclude path support (Soong) am: 1fa3ac552d
am: fbfc32ea1b

Change-Id: Iab4585fc6f76c2c9964451a9a7eb15153e5fa4f6
2017-11-09 03:10:16 +00:00
Jeff Gaston 99a5635733 Merge "Pass results of Finder into Blueprint" 2017-11-09 03:07:36 +00:00
Vishwath Mohan fbfc32ea1b CFI include/exclude path support (Soong)
am: 1fa3ac552d

Change-Id: Ie568728de525dad6917ea3d399c49baf1e76165a
2017-11-09 03:06:06 +00:00
Vishwath Mohan 1fa3ac552d CFI include/exclude path support (Soong)
This CL adds the ability to centrally enable or disable CFI for
components using either an environment or product config
variable. This is a better, nore manageable option that enabling CFI
across each component individually.

Bug: 67507323
Test: CFI_INCLUDE_PATHS= system/nfc m -j40
Test: CFI_EXCLUDE_PATHS = frameworks/av m -j40

Change-Id: I38b77946759121aec99ab25f31aaee2e5d993f73
2017-11-08 18:56:10 -08:00
Jeff Gaston 4d11c54ee5 Merge changes I73abb992,Ifcd42073 am: 06643be323 am: 71d64a6c4c
am: 573bcdb36f

Change-Id: If127ec074a9b1a2440efb6605bdb9b7ac08e1f28
2017-11-09 00:30:36 +00:00
Jeff Gaston 573bcdb36f Merge changes I73abb992,Ifcd42073 am: 06643be323
am: 71d64a6c4c

Change-Id: Ib545ab199e6364b818477c503ed9ebdf72010236
2017-11-09 00:28:44 +00:00
Jeff Gaston 71d64a6c4c Merge changes I73abb992,Ifcd42073
am: 06643be323

Change-Id: I9f158982dcd055165348e2a5e66257441ecf0f00
2017-11-09 00:26:13 +00:00
Jeff Gaston 06643be323 Merge changes I73abb992,Ifcd42073
* changes:
  Have sbox remove its output directory before running
  Consolidate gensrcs implementation into one task each
2017-11-09 00:23:37 +00:00
Jeff Gaston dfdb1b6994 Merge "Have genrule use $genDir as sbox's --output-root" am: 94cc5662c4 am: 9c15f09db5
am: 764d95cde8

Change-Id: I321d1a0819b9a237cf55083f106836c4847bfaaf
2017-11-08 23:55:38 +00:00
Jeff Gaston d3e141de80 Pass results of Finder into Blueprint
Bug: 64363847
Test: m -j

Change-Id: I79db8c524af6e77c35a0199ec1876e5eb94e8971
2017-11-08 23:48:44 +00:00
Jeff Gaston 764d95cde8 Merge "Have genrule use $genDir as sbox's --output-root" am: 94cc5662c4
am: 9c15f09db5

Change-Id: I17557b16f81f6046ad7c8125d664726f9b4410c0
2017-11-08 23:40:38 +00:00
Jeff Gaston 9c15f09db5 Merge "Have genrule use $genDir as sbox's --output-root"
am: 94cc5662c4

Change-Id: I4fc01748949520ba99cf7cfa6f964884bc68760c
2017-11-08 23:30:06 +00:00
Jeff Gaston 94cc5662c4 Merge "Have genrule use $genDir as sbox's --output-root" 2017-11-08 23:18:25 +00:00
Jeff Gaston 8a88db5a35 Have sbox remove its output directory before running
Bug: 38205169
Test: m -j
Change-Id: I73abb9921596c96fa056449bdf8250c2928bceda
2017-11-08 13:44:03 -08:00
Dan Willemsen 7397873cc6 Fix mac build am: 02c4c1d3f0 am: 90636a4386
am: 89a9dd2733

Change-Id: I7017f0aa7b8df9a34b72a1c114e1c8c71b7a0708
2017-11-08 21:28:28 +00:00
Dan Willemsen 89a9dd2733 Fix mac build am: 02c4c1d3f0
am: 90636a4386

Change-Id: I8142e4a830bd16010d7c22534042803e7b454fcf
2017-11-08 21:25:44 +00:00
Dan Willemsen 90636a4386 Fix mac build
am: 02c4c1d3f0

Change-Id: I74f6e2e62ee6730c1f7e52a7766c2f2a32c6cf5e
2017-11-08 21:20:47 +00:00
Dan Willemsen 02c4c1d3f0 Fix mac build
Test: `m nothing` on mac
Change-Id: Ibc377134dbcc5d40263697ef1e79fc31b16e0d1d
2017-11-08 12:50:38 -08:00
Dan Willemsen 9f78357048 Merge "Setup java paths in soong_ui" am: b760f5d638 am: 35c08994a8
am: a8a6f359c3

Change-Id: I43b374ce42bef42bb803adbef706d09738777fc9
2017-11-08 20:47:25 +00:00
Dan Willemsen a8a6f359c3 Merge "Setup java paths in soong_ui" am: b760f5d638
am: 35c08994a8

Change-Id: I36fb811e7407f1d54722b4b21d32bf1a455b2079
2017-11-08 20:43:41 +00:00
Dan Willemsen 35c08994a8 Merge "Setup java paths in soong_ui"
am: b760f5d638

Change-Id: I4f1fb0a45fa051a864db13c442a2fe792e815260
2017-11-08 20:40:17 +00:00
Jeff Gaston 437d23c3ad Consolidate gensrcs implementation into one task each
in preparation for each task to delete its output dir
before running.

Bug: 38205169
Test: rm out -rf && m -j

Change-Id: Ifcd42073d4fb74f532adc0c095555b4a542feb99
2017-11-08 12:38:00 -08:00
Jeff Gaston 5acec2b0e0 Have genrule use $genDir as sbox's --output-root
rather than passing buildDir .
This will make it reasonable for sbox to delete its --output-root

Bug: 38205169
Test: m -j
Change-Id: Ic3a82a8df040117870c251c068a88545143257cf
2017-11-08 12:37:14 -08:00
Dan Willemsen b760f5d638 Merge "Setup java paths in soong_ui" 2017-11-08 20:31:30 +00:00