Commit Graph

10777 Commits

Author SHA1 Message Date
Dan Willemsen
18a2229bab Merge "Soong: Read Android.soong.mk if skipping Android.mk" am: ea71c96894
am: b8759f4f4b

* commit 'b8759f4f4b060fe9c4dc60fa6d786949b81f4ca0':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: Ibc2622b8292cb33270fe89ee8fcae4cdeb6b60c9
2016-05-13 23:58:48 +00:00
Dan Willemsen
b8759f4f4b Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am: ea71c96894

* commit 'ea71c968943209f41191a1f164f899dd002b9119':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478
2016-05-13 23:56:11 +00:00
Dan Willemsen
5b188fb539 Soong: Read Android.soong.mk if skipping Android.mk
If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.

Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
2016-05-13 16:10:41 -07:00
Colin Cross
9d888e37bb Merge "Default USE_SOONG to true" am: ac33935ac1
am: c33da56ff3

* commit 'c33da56ff30e89f5b09ec02d0b50815b27ab833e':
  Default USE_SOONG to true

Change-Id: Ib795a91a609da4402984c56a493e20dee90ec54f
2016-05-13 22:46:50 +00:00
Colin Cross
c33da56ff3 Merge "Default USE_SOONG to true"
am: ac33935ac1

* commit 'ac33935ac1721c640ce39b722cb7471ea9a5949d':
  Default USE_SOONG to true

Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
2016-05-13 22:44:16 +00:00
Colin Cross
ac33935ac1 Merge "Default USE_SOONG to true" 2016-05-13 22:40:23 +00:00
Dan Willemsen
28ffa853ee Merge "Don\'t use GTEST_OS_LINUX on Darwin" am: 439f4dd189
am: 33b3051784

* commit '33b30517846744adff51579f26a711732caaa338':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Iff14f3c4819c2b604bf0c39b69a45110fcee1fbf
2016-05-13 22:36:22 +00:00
Evgenii Stepanov
80a9d0e20a Merge "Pass USE_SAFESTACK to Soong." am: 00bccf54d4
am: 5bd91e69f7

* commit '5bd91e69f79db2cee14bd18d08f6be7720d6ff5c':
  Pass USE_SAFESTACK to Soong.

Change-Id: I55b7ba71e7efdb401d5466af13895f94a3972020
2016-05-13 22:36:21 +00:00
Dan Willemsen
33b3051784 Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am: 439f4dd189

* commit '439f4dd1895eef8684b3257fe5631a45d51635d6':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
2016-05-13 22:33:48 +00:00
Evgenii Stepanov
5bd91e69f7 Merge "Pass USE_SAFESTACK to Soong."
am: 00bccf54d4

* commit '00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
  Pass USE_SAFESTACK to Soong.

Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
2016-05-13 22:33:47 +00:00
Dan Willemsen
439f4dd189 Merge "Don't use GTEST_OS_LINUX on Darwin" 2016-05-13 22:29:16 +00:00
Evgenii Stepanov
7f13ab998a Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
2016-05-13 14:40:58 -07:00
Dan Willemsen
66fced615f Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
2016-05-13 21:10:50 +00:00
Alan Viverette
e5368fa373 Add documents-archive to SDK, docs builds
Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472
2016-05-13 14:17:33 -04:00
Alan Viverette
55e80ef5c4 Add missing support library projects to pathmap
Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
2016-05-13 14:15:25 -04:00
Shinichiro Hamaji
641e61cb53 Make apks depend on their certificates
Bug: 27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 16:03:24 +09:00
Shinichiro Hamaji
4ed2ff913b resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp
Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
2016-05-13 14:33:34 +09:00
Shinichiro Hamaji
505f1eaaa9 Merge "Follow symlinks when using find for assets"
am: 4c4c06016b

* commit '4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
  Follow symlinks when using find for assets

Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
2016-05-13 05:24:35 +00:00
Shinichiro Hamaji
4c4c06016b Merge "Follow symlinks when using find for assets" 2016-05-13 05:20:05 +00:00
Dan Willemsen
2697421213 Merge "Read Soong-exported configuration" am: c7b610a67e
am: bcbba61a25

* commit 'bcbba61a2500da9c51690ef8956e15020e9f6fea':
  Read Soong-exported configuration

Change-Id: Ia23208e26bae53bd74bb77b0a0ebbe63ac6f8a9c
2016-05-13 01:43:09 +00:00
Dan Willemsen
bcbba61a25 Merge "Read Soong-exported configuration"
am: c7b610a67e

* commit 'c7b610a67ebff333cede41d5f336165485c9ae5d':
  Read Soong-exported configuration

Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
2016-05-13 01:40:48 +00:00
Baligh Uddin
f193546d65 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
Dan Willemsen
da8ae4c1a1 Merge "Use product-specific Soong outputs" am: f100d01dd5
am: f8c5eac739

* commit 'f8c5eac739399522fffe3521f9d782aecfa6ca48':
  Use product-specific Soong outputs

Change-Id: I559504dc7338f19c0dd4776495b3f27c8b0a7cd6
2016-05-12 20:46:28 +00:00
Dan Willemsen
f8c5eac739 Merge "Use product-specific Soong outputs"
am: f100d01dd5

* commit 'f100d01dd5dde712a19bd75f8f6895b21641bd62':
  Use product-specific Soong outputs

Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
2016-05-12 20:43:47 +00:00
Dan Willemsen
8b999ac63d Read Soong-exported configuration
This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.

Bug: 23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
2016-05-12 13:36:33 -07:00
Dan Willemsen
f100d01dd5 Merge "Use product-specific Soong outputs" 2016-05-12 20:33:05 +00:00
Ian Pedowitz
4df6466c0d Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am: 77df46efec

* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I463332a4a8e3113749de2a0179c086f45a07c7a3
2016-05-12 19:01:17 +00:00
Ian Pedowitz
8313541c65 PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Shinichiro Hamaji
d8f9f7d873 Follow symlinks when using find for assets
This should have been done in
https://android-review.googlesource.com/#/c/43901/

Bug: 27954979
Change-Id: I663b5e87e0d844d37a59e404219ff5e7e364df74
2016-05-12 18:17:02 +09:00
Shinichiro Hamaji
b9179f9886 Merge "Correct some dependencies around zip packages" am: b6f2c8fac8
am: eac63ed087

* commit 'eac63ed087e7e84a80ddc6c45d2f21bfae5617b0':
  Correct some dependencies around zip packages

Change-Id: I783119bdce2044473c96c680cd035d131604dc94
2016-05-12 02:23:45 +00:00
Shinichiro Hamaji
eac63ed087 Merge "Correct some dependencies around zip packages"
am: b6f2c8fac8

* commit 'b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
  Correct some dependencies around zip packages

Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
2016-05-12 02:20:36 +00:00
Shinichiro Hamaji
b6f2c8fac8 Merge "Correct some dependencies around zip packages" 2016-05-12 02:06:42 +00:00
Baligh Uddin
16690162c3 DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.

Bug: 28726512
2016-05-11 16:32:17 -07:00
Wei Wang
2c5e71fbe8 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" am: 648ea82b04
am: a22d0a88ba

* commit 'a22d0a88ba74bba43a8683e542b5f46eb9afce22':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I44390a1512b24880183d40d35087409b9693435f
2016-05-11 22:03:31 +00:00
Chih-Hung Hsieh
2734991ca9 Merge "Add misc-macro-parentheses to default tidy checks." am: a55b7ec4c3
am: 16af95b4a5

* commit '16af95b4a5dc425ec59f58608d3a4547c522b278':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: Ia5b7b958cc0c788790a4327e0dba707179e39fb7
2016-05-11 22:03:21 +00:00
Wei Wang
a22d0a88ba Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am: 648ea82b04

* commit '648ea82b048a83dfcc68aa3419523502b3a1485f':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
2016-05-11 21:57:08 +00:00
Chih-Hung Hsieh
16af95b4a5 Merge "Add misc-macro-parentheses to default tidy checks."
am: a55b7ec4c3

* commit 'a55b7ec4c38f5de172d51e805215505196c7702d':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
2016-05-11 21:57:03 +00:00
Alex Klyubin
8a86f9ea4d Fix handling of version codes in minSdkVersion when signing.
am: f59ad14c1f

* commit 'f59ad14c1f7cb07a4669741f8b0bb1e938398eca':
  Fix handling of version codes in minSdkVersion when signing.

Change-Id: Ie53be2528b32bc2eaa70645000ad66473422e06f
2016-05-11 21:56:43 +00:00
Treehugger Robot
648ea82b04 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" 2016-05-11 21:49:56 +00:00
Chih-Hung Hsieh
e1ea9434c1 Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.

Bug: 28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
2016-05-11 13:43:11 -07:00
Wei Wang
2e735ca34e Include BRILLO_VENDOR_PARTITIONS in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.

The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.

BUG: 28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
2016-05-11 12:26:04 -07:00
Alex Klyubin
f59ad14c1f Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.

However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.

Bug: 28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
2016-05-11 12:11:11 -07:00
Shinichiro Hamaji
ee2d21195c Correct some dependencies around zip packages
Add scripts which creates these packages to their dependencies.
$(SYMBOLS_ZIP) contains symbol info of the updater binary so
it should depend on it.

Bug: 27954979
Change-Id: If78746ec843dd57fe5fdda3ed504a12bb298ea1d
2016-05-12 02:07:56 +09:00
Tao Bao
ec960e2b55 Merge "Revert "Include vendor partitions in target zip generation"" am: 7ff7c2d870
am: b1963b65a4

* commit 'b1963b65a45ddef3159b542ee49d82a6c310f1d4':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I468caee113cba2b51ca225a9d8de8b791ed502fd
2016-05-11 15:21:28 +00:00
Wei Wang
b1963b65a4 Merge "Revert "Include vendor partitions in target zip generation""
am: 7ff7c2d870

* commit '7ff7c2d8709bf1f8fa6e6d8350dcea63f1a9b3e8':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I76559ad1211a38eecd7b15ec1a4b5ca5bd3f6914
2016-05-11 15:18:42 +00:00
Tao Bao
7ff7c2d870 Merge "Revert "Include vendor partitions in target zip generation"" 2016-05-11 15:11:57 +00:00
Wei Wang
05e6f679e6 Revert "Include vendor partitions in target zip generation"
This reverts commit 421fe44ae8.

Change-Id: Id45781de73735783bc7dfb6fc2838957578d00d3
2016-05-11 14:49:50 +00:00
Nicholas Sauer
e7fbe9c3f2 Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
am: 40ef6697be

* commit '40ef6697be0fb9535b306f5f5acf5eaa6bd5e8c7':
  Add org.apache.harmony.tests.javax.xml to old cts

Change-Id: Ia4d6800efbf46679011485e6821833bdbdd1590f
2016-05-11 14:40:52 +00:00
Nicholas Sauer
40ef6697be Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev 2016-05-11 14:35:15 +00:00
Dan Willemsen
57aa920ddb Use product-specific Soong outputs
This way, when switching between two products, we don't need to re-run
kati.

Change-Id: I0a8b3b49f1b76d9e120ea93bb5d2aa06cd189679
2016-05-11 00:40:43 -07:00