Commit Graph

29582 Commits

Author SHA1 Message Date
Colin Cross 01437aa5d3 Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053
am: 18023b557b

* commit '18023b557b6d33836de380df397fce10598931a9':
  Update Android.mk finder to work with Android.bp files

Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
2016-06-01 05:05:33 +00:00
Colin Cross 18023b557b Merge "Update Android.mk finder to work with Android.bp files"
am: 520442f053

* commit '520442f0537c72276147e86116a1170ea1ddc9d7':
  Update Android.mk finder to work with Android.bp files

Change-Id: Ic737bc2d3e693dc7398fff665f7557c3e2e2a72b
2016-06-01 05:01:28 +00:00
Colin Cross 520442f053 Merge "Update Android.mk finder to work with Android.bp files" 2016-06-01 04:52:47 +00:00
Dan Willemsen 6532011f9f Merge "Add Soong tools to PATH" am: b09e644e1d
am: 28874dc0c1

* commit '28874dc0c1c790005672406ea50729579096d6f4':
  Add Soong tools to PATH

Change-Id: I5a8f9a27a651c1c79469e53daa1cc34a6febbbc8
2016-06-01 02:49:05 +00:00
Dan Willemsen 28874dc0c1 Merge "Add Soong tools to PATH"
am: b09e644e1d

* commit 'b09e644e1db3439d85ce6dd9e371ac6514a4343c':
  Add Soong tools to PATH

Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
2016-06-01 02:45:03 +00:00
Dan Willemsen b09e644e1d Merge "Add Soong tools to PATH" 2016-06-01 02:37:19 +00:00
Dan Willemsen 60d9c673d7 Add Soong tools to PATH
Change-Id: I8f8649106df4ba7cefbfa37a724ebe0635d90b76
2016-05-31 18:32:35 -07:00
Dan Willemsen 6a55b1c681 Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8
am: 99e2c216b4

* commit '99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
2016-05-31 22:23:11 +00:00
Dan Willemsen 99e2c216b4 Merge "Allow arm prebuilts for x86_arm builds"
am: fcaae6bee8

* commit 'fcaae6bee83c62703339f0e54751b244ef7fd7b7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41
2016-05-31 22:20:19 +00:00
Treehugger Robot fcaae6bee8 Merge "Allow arm prebuilts for x86_arm builds" 2016-05-31 22:08:15 +00:00
Dan Willemsen b40d9ece5f Allow arm prebuilts for x86_arm builds
But only for static and shared libraries -- we disable building other
types of modules for arm, so don't support the prebuilts for them
either.

This is needed so that we can build these libraries under Soong, and
expose them to Make using BUILD_PREBUILT.

Bug: 27526885
Change-Id: I4f6ec922aed37591b6257b7022b81fb65d05b0fe
2016-05-31 14:01:34 -07:00
Colin Cross 4cbf8eb9f5 Update Android.mk finder to work with Android.bp files
The Android.mk finder should stop traversing when it finds an Android.bp
file, and any Android.soong.mk file at the same path should be included.

Update filter-soong-makefiles to accept a mixed list of Android.bp files
and Android.mk files, convert Android.bp files to Android.soong.mk files
if they exist, and ignore Android.mk files that have an Android.bp file.

Update first-makefiles-under to use the new --dir syntax for
findleaves.py and search for both Android.bp and Android.mk files.

Update all-makefiles-under and all-named-subdir-makefiles to search for
both Android.bp and Android.mk files.

Change-Id: Iddc51bf84593d5de3add02f2b2c065da08962af4
2016-05-30 13:42:19 -07:00
Lance Chang eaa4ef4cfc Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am: 1059f37377

* commit '1059f37377fd37cc311db522b4b5689086480d17':
  Add build number to apps' version name for non-platform build

Change-Id: Iad8a4f271db54561d605a3f98f59a62e97eb1614
2016-05-28 18:43:57 +00:00
Lance Jin-woong Chang 1059f37377 Merge "Add build number to apps' version name for non-platform build" into nyc-dev 2016-05-28 18:28:40 +00:00
Colin Cross 116a8ef96b Merge "Add --dir option to findleaves.py" am: 40623e2a99
am: 1d7930b2be

* commit '1d7930b2bedad092189bca3336a9cf717b9b4f37':
  Add --dir option to findleaves.py

Change-Id: Id2027d82ae83efd1ca05379b200b7f48ac44b6be
2016-05-28 01:04:52 +00:00
Colin Cross 1d7930b2be Merge "Add --dir option to findleaves.py"
am: 40623e2a99

* commit '40623e2a995247907028b12538a2732ac107a057':
  Add --dir option to findleaves.py

Change-Id: I6708e21ca14a5d4e7218c792b6bc6ee0fd6818e8
2016-05-28 01:01:43 +00:00
Treehugger Robot 40623e2a99 Merge "Add --dir option to findleaves.py" 2016-05-28 00:53:47 +00:00
Baligh Uddin 86b9acbb96 Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021 am: 5d77e7e0c1 am: 9f527d5222
am: b4e6eb0e56

* commit 'b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ia0dbdd270f4ece349a732189f6f944912e498248
2016-05-27 23:48:04 +00:00
Baligh Uddin b4e6eb0e56 Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021 am: 5d77e7e0c1
am: 9f527d5222

* commit '9f527d52229c973fddd94b926b803a6be68ae440':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
2016-05-27 23:45:56 +00:00
Baligh Uddin 9f527d5222 Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021
am: 5d77e7e0c1

* commit '5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
2016-05-27 23:42:55 +00:00
Baligh Uddin 1b25872620 DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours am: a21a89051e -s ours am: 88582dfa7b -s ours
am: 3200f49a5c  -s ours

* commit '3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
  DO NOT MERGE ANYWHERE -

Change-Id: I89da093040461885a861985dddcc169cd675e6c9
2016-05-27 23:40:04 +00:00
Baligh Uddin 5d77e7e0c1 Add system/extras/verity/build_verity_metadata.py to otatools
am: e718501021

* commit 'e718501021dd039875745d3ff829341c2bb05248':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
2016-05-27 23:40:02 +00:00
Baligh Uddin 3200f49a5c DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours am: a21a89051e -s ours
am: 88582dfa7b  -s ours

* commit '88582dfa7bb9be8e87b091a7fa705b6669390f8d':
  DO NOT MERGE ANYWHERE -

Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
2016-05-27 23:37:47 +00:00
Baligh Uddin 88582dfa7b DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours
am: a21a89051e  -s ours

* commit 'a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
  DO NOT MERGE ANYWHERE -

Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
2016-05-27 23:34:54 +00:00
Baligh Uddin a21a89051e DO NOT MERGE ANYWHERE -
am: 442ae0fe5c  -s ours

* commit '442ae0fe5c76ddabe52e595689a86838820ecbf1':
  DO NOT MERGE ANYWHERE -

Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
2016-05-27 23:32:09 +00:00
Baligh Uddin e718501021 Add system/extras/verity/build_verity_metadata.py to otatools
Bug: 29008004
2016-05-27 16:28:36 -07:00
Baligh Uddin 442ae0fe5c DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
2016-05-27 23:19:57 +00:00
Colin Cross 9808645cd9 Add --dir option to findleaves.py
findleaves.py needs to be able to search multiple directories for
multiple filenames (Android.bp and Android.mk).  Add support for a new
--dir= option to specify one or more directories to search, and then
treat any remaining options as filenames.  If no directories are
specified, fall back to treating only the last option as a filename and
the rest as directories.

Change-Id: Ie879facd49192c6b4fafae070ad00eb21b1faa32
2016-05-27 16:05:10 -07:00
Baligh Uddin a6eb0da1d3 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6 am: 1e7c1290c6 am: b25a7f38a8
am: b637cb2e99

* commit 'b637cb2e996febbab295b83af8176ec39b864186':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: If3169c81ac00c80dcb3acb45a03af269009c846e
2016-05-27 22:45:39 +00:00
Baligh Uddin b637cb2e99 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6 am: 1e7c1290c6
am: b25a7f38a8

* commit 'b25a7f38a876ee2f9acd90123021401ce73d3aac':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
2016-05-27 22:43:20 +00:00
Baligh Uddin b25a7f38a8 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6
am: 1e7c1290c6

* commit '1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
2016-05-27 22:40:22 +00:00
Baligh Uddin 1e7c1290c6 Add system/extras/verity/build_verity_metadata.py to otatools
am: d26a99c3c6

* commit 'd26a99c3c6903c02c5435ec5f0123f057527b0a9':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
2016-05-27 22:37:29 +00:00
Baligh Uddin d26a99c3c6 Add system/extras/verity/build_verity_metadata.py to otatools
Bug: 29008004
2016-05-27 15:19:31 -07:00
Alex Klyubin fe2470994e Merge "Improve DataSource interface." am: ce4c9d7108
am: f41e840250

* commit 'f41e840250e2c0e5cce9263edbcb43fec4163d85':
  Improve DataSource interface.

Change-Id: Ibf017a47be707dbd0576021832ce760a7dcaa21a
2016-05-27 20:12:27 +00:00
Alex Klyubin f41e840250 Merge "Improve DataSource interface."
am: ce4c9d7108

* commit 'ce4c9d71080d27ce321b1aa49e2189ee55bb25fa':
  Improve DataSource interface.

Change-Id: I8a1df06ee64785ae48414b2468e760c41d7f41f3
2016-05-27 20:07:42 +00:00
Alex Klyubin ef6b69d741 Merge "Store entry alignment information in APK." am: 85f004c6c5
am: 4ea527597e

* commit '4ea527597e72ddff825a32fc24c6e4970d50da8f':
  Store entry alignment information in APK.

Change-Id: I3ab22f58eba48743a6533265217f09ab007840f6
2016-05-27 20:07:40 +00:00
Alex Klyubin 4ea527597e Merge "Store entry alignment information in APK."
am: 85f004c6c5

* commit '85f004c6c5995da4f9175eb65b90f48f601d658d':
  Store entry alignment information in APK.

Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11
2016-05-27 20:02:10 +00:00
Alex Klyubin ce4c9d7108 Merge "Improve DataSource interface." 2016-05-27 20:00:59 +00:00
Alex Klyubin 85f004c6c5 Merge "Store entry alignment information in APK." 2016-05-27 19:57:11 +00:00
Alex Klyubin 7b977ea0e9 Improve DataSource interface.
1. This adds way to obtain a DataSource which represents a region of
   data contained in the DataSource.
2. This fixes a design bug in "feed" method where the size parameter
   was an int instead of long.
3. This fixes a bug in ByteBufferDataSource where its mSize field was
   a long instead of an int (ByteBuffer's length cannot be more than
   2^31).

Bug: 27461702
Change-Id: Ib0812784beb581f19d2412e667b8bd018f0a3c78
2016-05-27 10:28:52 -07:00
Bjoern Johansson a521a01345 Merge "Remove Dev Settings app from emulator images" into nyc-dev
am: 4f2f58791f

* commit '4f2f58791f31a66a61865e6c6095a2113609577a':
  Remove Dev Settings app from emulator images

Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
2016-05-27 17:24:36 +00:00
Bjoern Johansson 4f2f58791f Merge "Remove Dev Settings app from emulator images" into nyc-dev 2016-05-27 17:19:13 +00:00
Colin Cross 6f8244b62d Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624
am: 323396993c

* commit '323396993c6651b4b98974df9e9d53118f27a840':
  Fix mm and mmm in Android.bp directories

Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
2016-05-27 00:29:14 +00:00
Colin Cross 323396993c Merge "Fix mm and mmm in Android.bp directories"
am: 8ed91b6624

* commit '8ed91b66240d3071a42365737f4cd5c7dbe601e1':
  Fix mm and mmm in Android.bp directories

Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
2016-05-27 00:26:30 +00:00
Treehugger Robot 8ed91b6624 Merge "Fix mm and mmm in Android.bp directories" 2016-05-27 00:23:24 +00:00
Dirk Dougherty bf886f4f3b Fix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804 am: 53cd365b2d
am: a5bce98621

* commit 'a5bce98621ef4aa7632ead4de267118f4832d6c2':
  Fix improper date reference in blog reader.

Change-Id: Iedec1fc31a923e12a9733427a7ee2666c761b3e5
2016-05-26 23:52:30 +00:00
Dirk Dougherty a5bce98621 Fix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804
am: 53cd365b2d

* commit '53cd365b2d2c2b074d628147a8a382275075bd1d':
  Fix improper date reference in blog reader.

Change-Id: I300892c3c4439354917872839c18e4c029160df1
2016-05-26 23:49:38 +00:00
Dirk Dougherty 53cd365b2d Fix improper date reference in blog reader. am: 2732bb762a
am: 0f6d425804

* commit '0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
  Fix improper date reference in blog reader.

Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
2016-05-26 23:46:18 +00:00
Dirk Dougherty 0f6d425804 Fix improper date reference in blog reader.
am: 2732bb762a

* commit '2732bb762a00828f36bda77c43c7fd14c7495cde':
  Fix improper date reference in blog reader.

Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
2016-05-26 23:43:35 +00:00
Colin Cross 8642525726 Fix mm and mmm in Android.bp directories
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file.  Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.

Bug: 28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
2016-05-26 15:56:21 -07:00