p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,216 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

7649 Commits

Author SHA1 Message Date
Chris Banes 0fd694f360 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev 
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
 2015-08-13 17:36:54 +00:00
Dan Albert dc0e7244a6 am 2c00d629: am 727b462a: Merge "Never allow -w." 
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
  Never allow -w.
 2015-08-13 17:02:13 +00:00
Dan Albert 2c00d62940 am 727b462a: Merge "Never allow -w." 
* commit '727b462a92635665ce636c63123078a970654480':
  Never allow -w.
 2015-08-13 16:52:55 +00:00
Dan Albert 727b462a92 Merge "Never allow -w." 2015-08-13 16:48:18 +00:00
Neil Fuller 53d1632681 am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:51:04 +00:00
Neil Fuller 5f19844067 am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:46:46 +00:00
Neil Fuller bc7680c4d7 Merge "Include the okhttp.jar when compiling against internal classes" 2015-08-13 10:40:39 +00:00
Chris Banes b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs 
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
 2015-08-13 10:42:02 +01:00
Dianne Hackborn 42ebdfc574 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 00:53:51 +00:00
Dianne Hackborn 25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Nick Kralevich 420662b9cd am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-13 00:00:36 +00:00
Nick Kralevich c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:53:50 +00:00
Nick Kralevich 5f79bcdd07 Merge changes from topic 'file_contexts.bin' 
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:46:28 +00:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings 
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
 2015-08-12 16:29:08 -07:00
Dan Albert df3fd1d128 Never allow -w. 
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.

Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
 2015-08-12 14:54:16 -07:00
Neil Fuller f39a25bc28 Include the okhttp.jar when compiling against internal classes 
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.

okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.

The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.

This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.

Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
 2015-08-12 09:30:58 +01:00
Dan Willemsen 8478f7abbd resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp 
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
 2015-08-11 18:31:59 -07:00
Dan Willemsen 33f46daa22 resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp 
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
 2015-08-11 18:21:43 -07:00
Dan Willemsen b184ec2a82 am 608aa91d: Merge "Revert "Use repeatable timestamps"" 
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"
 2015-08-12 01:07:44 +00:00
Dan Willemsen 608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00
Dan Willemsen 92026f2d36 Revert "Use repeatable timestamps" 
OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
 2015-08-12 01:00:19 +00:00
Dan Willemsen c576c08fd5 am 671b8ff5: Merge "Use repeatable timestamps" 
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
  Use repeatable timestamps
 2015-08-12 00:55:21 +00:00
Dan Willemsen 671b8ff545 Merge "Use repeatable timestamps" 2015-08-12 00:49:26 +00:00
Dan Willemsen 13ba6e00f4 Use repeatable timestamps 
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
 2015-08-11 17:08:03 -07:00
Ying Wang 2bf0ba2dcf am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
  Don't build otapackage on Mac.
 2015-08-11 23:23:39 +00:00
Ying Wang 23cb26c7bf am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
  Don't build otapackage on Mac.
 2015-08-11 23:14:52 +00:00
Ying Wang 20febe3d83 Merge "Don't build otapackage on Mac." 2015-08-11 22:49:25 +00:00
Ying Wang 09c4b68dfd Don't build otapackage on Mac. 
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.

Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
 2015-08-11 11:45:54 -07:00
Ian Pedowitz d18917b781 am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:42:15 +00:00
Ian Pedowitz a18c5028d7 Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
 2015-08-11 10:02:15 -07:00
Ian Pedowitz a1c92301f4 am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:17:49 +00:00
Ian Pedowitz 38ffb0cf89 Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
 2015-08-11 07:50:04 -07:00
Ying Wang 49e20876b6 am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
 2015-08-10 22:28:30 +00:00
Ying Wang a16556450c am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
  Allow custom recovery resource dirs.
 2015-08-10 22:23:10 +00:00
Ying Wang edf7bf8d83 Merge "Allow custom recovery resource dirs." 2015-08-10 22:15:23 +00:00
Dan Albert 92d6efc595 am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:53:59 +00:00
Dan Albert 96f480c93a am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:48:48 +00:00
Dan Albert c7d307d873 Bump the default C++ standard up to C++14. 
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.

Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
 2015-08-10 13:37:42 -07:00
Ying Wang 9a17568624 Allow custom recovery resource dirs. 
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.

Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
 2015-08-10 11:33:10 -07:00
Dan Willemsen 544fabcef0 am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0" 
* commit 'b8331622962be9d044eedce0aa1dff33ca1c5b16':
  build: Load makefiles in the same order with Make 4.0
 2015-08-07 20:20:56 +00:00
Dan Willemsen b833162296 am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0" 
* commit '46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8':
  build: Load makefiles in the same order with Make 4.0
 2015-08-07 00:54:47 +00:00
Dan Willemsen 46ed451d12 Merge "build: Load makefiles in the same order with Make 4.0" 2015-08-07 00:47:51 +00:00
Yusuf Ozuysal d513d14c8f am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev 
* commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
  Add support-customtabs to the doc build.
 2015-08-07 00:21:19 +00:00
Yusuf Ozuysal 736463f86c Merge "Add support-customtabs to the doc build." into mnc-dev 2015-08-07 00:10:39 +00:00
Dan Willemsen ec224d5072 build: Load makefiles in the same order with Make 4.0 
Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.

This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.

Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
 2015-08-06 15:21:30 -07:00
Gilad Arnold 09905505f7 am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path." 
* commit '5070204e117d5a20f06fa337c652e36884f29d86':
  Remove LOCAL_MODULE from generated DBus header path.
 2015-08-06 22:10:29 +00:00
Gilad Arnold 5070204e11 am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path." 
* commit '7b49da7e9a97f7064e275251957ed78dc5e38360':
  Remove LOCAL_MODULE from generated DBus header path.
 2015-08-06 22:02:56 +00:00
Gilad Arnold 7b49da7e9a Merge "Remove LOCAL_MODULE from generated DBus header path." 2015-08-06 21:55:47 +00:00
Dan Albert a1df0e6717 am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries." 
* commit '100422b2311a96fbbdb1ba62a9945c2637c9e861':
  Dedup system shared libraries.
 2015-08-06 21:40:18 +00:00
Dan Albert 6d5c952a7e am 849bf820: am 735cd90d: Merge "Disable transitive symbol resolving for mips64." 
* commit '849bf82079ea33b84c7c01fbc2e52205843720ed':
  Disable transitive symbol resolving for mips64.
 2015-08-06 21:40:17 +00:00