Commit Graph

27181 Commits

Author SHA1 Message Date
Dan Willemsen 8a78c90a95 Merge "Switch some build tools to Soong"
am: c52d09e694

* commit 'c52d09e6944e531e02242cf971020cb2c0cf9844':
  Switch some build tools to Soong

Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
2016-06-06 22:58:28 +00:00
Treehugger Robot c52d09e694 Merge "Switch some build tools to Soong" 2016-06-06 22:51:57 +00:00
Dan Willemsen 56eb2f9f54 Switch some build tools to Soong
In preparation for including them in prebuilts/build-tools.

acp: We use a prebuilt in prebuilts/sdk, but it's not part of the sdk.

ijar: We use the host libstdc++ to workaround the lack of libc++ on
some unbundled branches.

ziptime: We disable this on unbundled builds, due to the lack of libc++.

Change-Id: Ib9766b1dbddd151c38ff27c529865200ab37fce1
2016-06-06 14:51:52 -07:00
Dan Willemsen d1f0eb15c8 Merge "Remove dead rgb2565"
am: a571e83095

* commit 'a571e83095a72d595e5e4e365e0ae52aefd64356':
  Remove dead rgb2565

Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
2016-06-06 21:39:48 +00:00
Treehugger Robot a571e83095 Merge "Remove dead rgb2565" 2016-06-06 21:35:47 +00:00
Dan Willemsen f03398b651 Merge "Drop CLANG and CLANG_CXX in the environment"
am: 27a55cd3c7

* commit '27a55cd3c703c190f933630e503d963ef7478183':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
2016-06-06 21:27:10 +00:00
Treehugger Robot 27a55cd3c7 Merge "Drop CLANG and CLANG_CXX in the environment" 2016-06-06 21:22:57 +00:00
Alex Klyubin 732b29a5c3 Merge "Improve efficiency of using the DataSource abstraction."
am: 7353eabd14

* commit '7353eabd14cbfae2c123a58cae4ce1e770ee351d':
  Improve efficiency of using the DataSource abstraction.

Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5
2016-06-06 21:17:02 +00:00
Alex Klyubin 7353eabd14 Merge "Improve efficiency of using the DataSource abstraction." 2016-06-06 21:07:52 +00:00
Dan Willemsen 08b12dc2c8 Remove dead rgb2565
Change-Id: I2397dc97768f24a7c416bff96dd983fc796cbb53
2016-06-06 13:32:11 -07:00
Dan Willemsen 6e22c756fc Drop CLANG and CLANG_CXX in the environment
We'll explicitly pass these variables to the static analyzer builds in
binary.mk

Bug: 29071982
Change-Id: Ifc7633d36f5785fe16b63f54b885396c2cab542a
2016-06-06 13:13:50 -07:00
Alex Klyubin 2f24b771ea Merge "Switch signapk to apksigner-core."
am: 1a39e8eb34

* commit '1a39e8eb3408f45d5f75b261fc073843ab83645b':
  Switch signapk to apksigner-core.

Change-Id: I39af8650adfc9ee12f5d6256e4a2083d4f87acfb
2016-06-06 19:52:25 +00:00
Alex Klyubin 1a39e8eb34 Merge "Switch signapk to apksigner-core." 2016-06-06 19:40:23 +00:00
Alex Klyubin b02eefacbf Improve efficiency of using the DataSource abstraction.
This adds getByteBuffer and copyTo methods to the DataSource
abstraction. These methods enable the client to avoid unnecessary
copying of the data source's data.

Bug: 27461702
Change-Id: If4e9f902ea75c1ca5c7be0e20c0e7218faf9c504
2016-06-06 11:17:03 -07:00
Dan Willemsen d983b78a6f Merge "Error on external includes"
am: 4b33f51043

* commit '4b33f510436f88774f5217b472835973fd8d5b2b':
  Error on external includes

Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
2016-06-04 01:09:52 +00:00
Dan Willemsen 4b33f51043 Merge "Error on external includes" 2016-06-04 01:03:20 +00:00
Chih-Hung Hsieh b764f7d0d6 Merge "Default to enable tidy warnings in header files."
am: 6a7cf55a7d

* commit '6a7cf55a7dfe844b4df173520890b4daee60ea63':
  Default to enable tidy warnings in header files.

Change-Id: Ib4ca529f2f81d05db8392a4f501bea3400f17d57
2016-06-02 23:27:17 +00:00
Treehugger Robot 6a7cf55a7d Merge "Default to enable tidy warnings in header files." 2016-06-02 23:18:00 +00:00
Tao Bao 88df5bee3a Merge "Add support for TARGET_RECOVERY_BRICK."
am: daf55776be

* commit 'daf55776beefeb3f59d2f7ca61796ad07fa1d738':
  Add support for TARGET_RECOVERY_BRICK.

Change-Id: I70a4682caca250d557975dcf19bfbf63bc567a24
2016-06-02 22:54:25 +00:00
Treehugger Robot daf55776be Merge "Add support for TARGET_RECOVERY_BRICK." 2016-06-02 22:44:56 +00:00
Chih-Hung Hsieh 870f087867 Default to enable tidy warnings in header files.
Change-Id: I3831f03facbbd6d17117d82f9ccac49bc2645237
2016-06-02 15:20:05 -07:00
Tao Bao a062c7e62d Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.

Bug: 27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
(cherry picked from commit 3051f4f11a)
2016-06-02 14:46:53 -07:00
Dan Willemsen 58b7c1c744 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
am: 476b5b1616

* commit '476b5b161613cc352961414b549a0553361d533b':
  Add LOCAL_LOGTAGS_FILES that prebuilts can use

Change-Id: Ib0b5bb5aac8b2d1c9896d58bb2c7928a63de4241
2016-06-01 23:47:18 +00:00
Daniel Micay 13f2b4cf2f Merge "disable unpriv perf by default in user{,debug} builds"
am: 4bc8280a98

* commit '4bc8280a9886d93870fab02eea73986d8ca08965':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Icb4e1ad8ec0bd491a99b541ac98dc95bf509aa63
2016-06-01 23:47:15 +00:00
Treehugger Robot 476b5b1616 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" 2016-06-01 23:28:10 +00:00
Jeffrey Vander Stoep 4bc8280a98 Merge "disable unpriv perf by default in user{,debug} builds" 2016-06-01 23:18:46 +00:00
Dan Willemsen b0a08b874c Add LOCAL_LOGTAGS_FILES that prebuilts can use
Soong modules can define logtags files that need to be combined into
/system/etc/event-log-tags, so add a new LOCAL_LOGTAGS_FILES variable
that can be used to specify *.logtags file outside of LOCAL_SRC_FILES.

Bug: 28989759
Change-Id: I53c5d396dfb7c6006806758f351eb5cdde90fe74
2016-06-01 15:31:44 -07:00
Colin Cross 91fbe6006a Merge "Update default NINJA_STATUS to show finished edges"
am: 27032630c0

* commit '27032630c0683c30fa78a7bf9432c5b651707f7b':
  Update default NINJA_STATUS to show finished edges

Change-Id: I8e9989722cc5855640a0fcd68597926ce7f0dfda
2016-06-01 05:01:30 +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 27032630c0 Merge "Update default NINJA_STATUS to show finished edges" 2016-06-01 04:52:59 +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 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 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
Daniel Micay f2ac912b19 disable unpriv perf by default in user{,debug} builds
Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-05-31 17:43:48 -04: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 b9dd243b1c Update default NINJA_STATUS to show finished edges
Update default NINJA_STATUS that includes percentage to match
6c2c2eecbf

Change-Id: I5694308abe26b71999d944c40962d59d50a73077
2016-05-31 12:38:04 -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
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
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
Alex Klyubin fa1da6c311 Switch signapk to apksigner-core.
This switches signapk's APK signing from its own signing logic to that
offered by apksigner-core library. OTA update package signing logic
remains inside signapk codebase.

Bug: 27461702
Change-Id: Ibf8435c555fe3f2b621d5189e7ae44f79082c810
2016-05-27 14:45:51 -07: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 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
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