OSDN Git Service

android-x86/build.git
9 years agoam 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new famili...
Dirk Dougherty [Tue, 14 Apr 2015 04:54:27 +0000 (04:54 +0000)]
am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit '70b2a811ccd6fa74770f5747aa5cd97d3bae4b33':
  Increment metadata files for new families pages.

9 years agoam 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages...
Dirk Dougherty [Tue, 14 Apr 2015 04:42:57 +0000 (04:42 +0000)]
am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit '9317e40807184cfa4b0e8bc001a12446dc3d9f15':
  Increment metadata files for new families pages.

9 years agoam ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 04:33:24 +0000 (04:33 +0000)]
am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit 'ffc357f098b9fb939d6869c0f2f1b70fb20c88b6':
  Increment metadata files for new families pages.

9 years agoMerge "Increment metadata files for new families pages." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 04:14:26 +0000 (04:14 +0000)]
Merge "Increment metadata files for new families pages." into lmp-docs

9 years agoam d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
smain@google.com [Tue, 14 Apr 2015 02:43:59 +0000 (02:43 +0000)]
am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site

* commit 'd4565d8f38bb89a385fa27c42f0129e7330bb5f1':
  skeleton structure for NDK site

9 years agoIncrement metadata files for new families pages.
Dirk Dougherty [Tue, 14 Apr 2015 01:30:39 +0000 (18:30 -0700)]
Increment metadata files for new families pages.

Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7

9 years agoam 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Tue, 14 Apr 2015 00:08:51 +0000 (00:08 +0000)]
am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""

* commit '051f18f0dce3d0e6278d5bd9b2aad03974549fb5':
  Revert "Enable linker -fix-cortex-a53-843419"

9 years agoam f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Mon, 13 Apr 2015 23:58:47 +0000 (23:58 +0000)]
am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""

* commit 'f37e96e232f7ac3d618526aafcd69705ac7bb3a4':
  Revert "Enable linker -fix-cortex-a53-843419"

9 years agoMerge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Mon, 13 Apr 2015 23:48:28 +0000 (23:48 +0000)]
Merge "Revert "Enable linker -fix-cortex-a53-843419""

9 years agoRevert "Enable linker -fix-cortex-a53-843419"
Andrew Hsieh [Mon, 13 Apr 2015 23:39:45 +0000 (23:39 +0000)]
Revert "Enable linker -fix-cortex-a53-843419"

This reverts commit 54b22a5a706f6556cda6ef3de13b9b0bdc22e989.

Change-Id: I23613490030783fb6da678de5a25f37caebe5f97

9 years agoam 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:27:54 +0000 (22:27 +0000)]
am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."

* commit '7862223034dee3ef9ac35e3a5346a24c77eacd1b':
  Add host tool fastboot to every build.

9 years agoam 47ff7f56: Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:17:14 +0000 (22:17 +0000)]
am 47ff7f56: Merge "Add host tool fastboot to every build."

* commit '47ff7f56d67ca0b819a95f90d428db2e4fd3364e':
  Add host tool fastboot to every build.

9 years agoMerge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:07:40 +0000 (22:07 +0000)]
Merge "Add host tool fastboot to every build."

9 years agoAdd host tool fastboot to every build.
Ying Wang [Mon, 13 Apr 2015 21:49:19 +0000 (14:49 -0700)]
Add host tool fastboot to every build.

Some tools expect fastboot to be present even in user builds.

Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d

9 years agoam def19e79: am 7c22c9a4: skeleton structure for NDK site
smain@google.com [Mon, 13 Apr 2015 21:06:02 +0000 (21:06 +0000)]
am def19e79: am 7c22c9a4: skeleton structure for NDK site

* commit 'def19e7974cbf1c17dce8f6e25d1bfefb8c55a92':
  skeleton structure for NDK site

9 years agoam 7c22c9a4: skeleton structure for NDK site
smain@google.com [Mon, 13 Apr 2015 20:53:34 +0000 (20:53 +0000)]
am 7c22c9a4: skeleton structure for NDK site

* commit '7c22c9a45ceb44d5c7b4237b89e4227acd839374':
  skeleton structure for NDK site

9 years agoam 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:51:53 +0000 (20:51 +0000)]
am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."

* commit '6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
  Add --include-cfi compiler option.

9 years agoam c8400a3e: Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:45:04 +0000 (20:45 +0000)]
am c8400a3e: Merge "Add --include-cfi compiler option."

* commit 'c8400a3e2fa2e647b74042f1f32bd83dbae255d4':
  Add --include-cfi compiler option.

9 years agoMerge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:34:49 +0000 (20:34 +0000)]
Merge "Add --include-cfi compiler option."

9 years agoskeleton structure for NDK site
smain@google.com [Sat, 11 Apr 2015 03:38:47 +0000 (20:38 -0700)]
skeleton structure for NDK site

Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497

9 years agoAdd --include-cfi compiler option.
David Srbecky [Mon, 13 Apr 2015 18:50:51 +0000 (19:50 +0100)]
Add --include-cfi compiler option.

Decouple generation of CFI from the rest of debug symbols.
This makes it possible to generate oat with CFI but without
the rest of debug symbols.

This is in line with intention of the .eh_frame section.
The section does not have the .debug_ prefix because it
is considered somewhat different to the rest of debug symbols.

Change-Id: I32816ecd4f30ac4e0dc69d69a4993e349c737f96

9 years agoam 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
Andrew Hsieh [Mon, 13 Apr 2015 03:16:51 +0000 (03:16 +0000)]
am 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"

* commit '45c4c5af9e226231167d374b27e30c6bf0e073ea':
  Enable linker -fix-cortex-a53-843419

9 years agoam 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
Andrew Hsieh [Mon, 13 Apr 2015 03:11:45 +0000 (03:11 +0000)]
am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"

* commit '7bd978c2b33c4c9ce2e75923a3eddc5643d03888':
  Enable linker -fix-cortex-a53-843419

9 years agoMerge "Enable linker -fix-cortex-a53-843419"
Andrew Hsieh [Mon, 13 Apr 2015 03:06:48 +0000 (03:06 +0000)]
Merge "Enable linker -fix-cortex-a53-843419"

9 years agoam bc8bb112: am f69594b1: am cccdfc8a: Deleting or modifying files in new templates...
David Friedman [Sat, 11 Apr 2015 03:11:26 +0000 (03:11 +0000)]
am bc8bb112: am f69594b1: am cccdfc8a: Deleting or modifying files in new templates-ndk directory.

* commit 'bc8bb112edfd949fb44f7511d40e5afcc5a6ec14':
  Deleting or modifying files in new templates-ndk directory.

9 years agoam f69594b1: am cccdfc8a: Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 03:02:27 +0000 (03:02 +0000)]
am f69594b1: am cccdfc8a: Deleting or modifying files in new templates-ndk directory.

* commit 'f69594b164da237d54288631ce457e6add636133':
  Deleting or modifying files in new templates-ndk directory.

9 years agoam cccdfc8a: Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 02:51:34 +0000 (02:51 +0000)]
am cccdfc8a: Deleting or modifying files in new templates-ndk directory.

* commit 'cccdfc8a21134de2137e0f3cdc49bfc65601c944':
  Deleting or modifying files in new templates-ndk directory.

9 years agoam 21132c61: am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for...
David Friedman [Sat, 11 Apr 2015 01:50:57 +0000 (01:50 +0000)]
am 21132c61: am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk

* commit '21132c6173753c94437dee0eb9e6c39638889009':
  Cloned templates-sdk to create baseline for templates-ndk

9 years agoam b35ecf96: am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to...
David Friedman [Sat, 11 Apr 2015 01:50:56 +0000 (01:50 +0000)]
am b35ecf96: am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

* commit 'b35ecf96a37ac31d04032836fc09d4f2c85a7e64':
  Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

9 years agoam d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:41:20 +0000 (01:41 +0000)]
am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk

* commit 'd5df2d949bb83b37f6cc7491a3b87dc4b29b7ff1':
  Cloned templates-sdk to create baseline for templates-ndk

9 years agoam c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk...
David Friedman [Sat, 11 Apr 2015 01:41:18 +0000 (01:41 +0000)]
am c005ee25: am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

* commit 'c005ee2518926c8f019048c9d6264061c2eb3994':
  Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

9 years agoDeleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 01:27:57 +0000 (18:27 -0700)]
Deleting or modifying files in new templates-ndk directory.

Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681

9 years agoam 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:34:51 +0000 (01:34 +0000)]
am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk

* commit '53b7c759ffaf80d87416a19ff2d3474e9fef52cb':
  Cloned templates-sdk to create baseline for templates-ndk

9 years agoam fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates direct...
David Friedman [Sat, 11 Apr 2015 01:34:50 +0000 (01:34 +0000)]
am fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

* commit 'fd16d0930a5a6a74dce77c9a2da5707a6078d3f1':
  Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

9 years agoam 3df0e226: am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an...
David Friedman [Sat, 11 Apr 2015 01:29:53 +0000 (01:29 +0000)]
am 3df0e226: am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.

* commit '3df0e2266584ad73ee2fc02e75051c1ae7ee480c':
  Cloned sdk-templates directory to create an ndk-templates directory for production use.

9 years agoam 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates...
David Friedman [Sat, 11 Apr 2015 01:20:05 +0000 (01:20 +0000)]
am 188a2bab: am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.

* commit '188a2bab026237eebe9a773dd8fc287eb9a714be':
  Cloned sdk-templates directory to create an ndk-templates directory for production use.

9 years agoCloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:19:45 +0000 (18:19 -0700)]
Cloned templates-sdk to create baseline for templates-ndk

Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a

9 years agoam 84520abc: Cloned sdk-templates directory to create an ndk-templates directory...
David Friedman [Sat, 11 Apr 2015 01:10:48 +0000 (01:10 +0000)]
am 84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.

* commit '84520abc75adda2e42e9e8d7365cfb41feca5268':
  Cloned sdk-templates directory to create an ndk-templates directory for production use.

9 years agoRevert "Cloned sdk-templates directory to create an ndk-templates directory for produ...
David Friedman [Sat, 11 Apr 2015 01:07:39 +0000 (01:07 +0000)]
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."

This reverts commit 84520abc75adda2e42e9e8d7365cfb41feca5268.

Change-Id: Id0734d134e424f1a101362781171371566f2ad7f

9 years agoCloned sdk-templates directory to create an ndk-templates directory for
David Friedman [Fri, 10 Apr 2015 23:46:14 +0000 (16:46 -0700)]
Cloned sdk-templates directory to create an ndk-templates directory for
production use.

Change-Id: Icf205892d98f5a58350d140b0b0c56d0dceea111

9 years agoam 05130993: am dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressiv...
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:38:40 +0000 (21:38 +0000)]
am 05130993: am dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."

* commit '05130993f4f5f76773022eee6f0f198816e63e91':
  Use -Wno-format-pedantic to disable overly aggressive format string warning.

9 years agoam dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format...
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:31:18 +0000 (21:31 +0000)]
am dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."

* commit 'dbecad05a9a9272a844d8649a89b987eb560c875':
  Use -Wno-format-pedantic to disable overly aggressive format string warning.

9 years agoMerge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:22:52 +0000 (21:22 +0000)]
Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."

9 years agoam d263924f: am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9...
Stephen Hines [Fri, 10 Apr 2015 16:35:53 +0000 (16:35 +0000)]
am d263924f: am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"

* commit 'd263924fe4d1203e97787e123ddd951879945bdd':
  Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver

9 years agoam 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait...
Stephen Hines [Fri, 10 Apr 2015 16:26:32 +0000 (16:26 +0000)]
am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"

* commit '69bd465b6e14294ce0678e8a18d28eb55abbe2c7':
  Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver

9 years agoMerge "Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
Stephen Hines [Fri, 10 Apr 2015 16:17:52 +0000 (16:17 +0000)]
Merge "Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"

9 years agoUse -Wno-format-pedantic to disable overly aggressive format string warning.
Stephen Hines [Fri, 10 Apr 2015 16:06:12 +0000 (09:06 -0700)]
Use -Wno-format-pedantic to disable overly aggressive format string warning.

Bug: 20148343

The latest clang warns on "%p" being used with non-void pointer types, which
would require a great deal of cleanup in several sub-projects.

Change-Id: I4175d5cf8709504455067c906a2eb8ccc8e25432

9 years agoam d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
Tao Bao [Fri, 10 Apr 2015 02:23:31 +0000 (02:23 +0000)]
am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"

* commit 'd0ca05493bfe06cf166e4e215cd9bf38936fb344':
  Dump fingerprints into recovery log

9 years agoam 8c76d1e0: Merge "Dump fingerprints into recovery log"
Tao Bao [Fri, 10 Apr 2015 02:12:59 +0000 (02:12 +0000)]
am 8c76d1e0: Merge "Dump fingerprints into recovery log"

* commit '8c76d1e07a819b0a127ae0df533b627995cf49ff':
  Dump fingerprints into recovery log

9 years agoMerge "Dump fingerprints into recovery log"
Tao Bao [Fri, 10 Apr 2015 02:04:35 +0000 (02:04 +0000)]
Merge "Dump fingerprints into recovery log"

9 years agoDump fingerprints into recovery log
Tao Bao [Wed, 8 Apr 2015 22:30:27 +0000 (15:30 -0700)]
Dump fingerprints into recovery log

No more guessing. We should have the info for OTA issues diagnosis.

Change-Id: I0ce919434444ab16a38cc7af818e64785509b0fb

9 years agoam c0a70d88: am 7c2bfaf3: Merge "Change the default multilib for host libraries to...
Colin Cross [Thu, 9 Apr 2015 21:00:49 +0000 (21:00 +0000)]
am c0a70d88: am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""

* commit 'c0a70d889f9c197cf927f697ee81a73910d62cfa':
  Change the default multilib for host libraries to "both"

9 years agoam 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
Colin Cross [Thu, 9 Apr 2015 20:55:01 +0000 (20:55 +0000)]
am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""

* commit '7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
  Change the default multilib for host libraries to "both"

9 years agoMerge "Change the default multilib for host libraries to "both""
Colin Cross [Thu, 9 Apr 2015 20:47:15 +0000 (20:47 +0000)]
Merge "Change the default multilib for host libraries to "both""

9 years agoam 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
Ying Wang [Thu, 9 Apr 2015 17:26:41 +0000 (17:26 +0000)]
am 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."

* commit '50010e96b68468692f5f110a04c40d66898131ab':
  Remove ancient ranlib workaround on Mac OS X.

9 years agoam 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
Ying Wang [Thu, 9 Apr 2015 17:16:44 +0000 (17:16 +0000)]
am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."

* commit '42a3e879b63abeadf8fd09403ebb084a3ead887b':
  Remove ancient ranlib workaround on Mac OS X.

9 years agoMerge "Remove ancient ranlib workaround on Mac OS X."
Ying Wang [Thu, 9 Apr 2015 17:07:43 +0000 (17:07 +0000)]
Merge "Remove ancient ranlib workaround on Mac OS X."

9 years agoRemove ancient ranlib workaround on Mac OS X.
Ying Wang [Thu, 9 Apr 2015 16:22:36 +0000 (09:22 -0700)]
Remove ancient ranlib workaround on Mac OS X.

Apparently we don't need it for Mac OS X 10.7 and above.

Change-Id: I5ee81700c16e8c66b2d5f2b373fd2d523b5ec018

9 years agoEnable linker -fix-cortex-a53-843419
Andrew Hsieh [Thu, 9 Apr 2015 04:37:36 +0000 (12:37 +0800)]
Enable linker -fix-cortex-a53-843419

Change-Id: Icb8a4ce4d5688847cfe536eba2139cdf7f6406f3

9 years agoam 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
Tao Bao [Thu, 9 Apr 2015 00:38:47 +0000 (00:38 +0000)]
am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"

* commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
  Fix the font size selection for recovery mode

9 years agoam b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
Ying Wang [Thu, 9 Apr 2015 00:38:45 +0000 (00:38 +0000)]
am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."

* commit 'b78a6d7b2cc97431e666228eee5f82eec4e49be8':
  Remove unnecessary confusing use of $(intermediate).

9 years agoam 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has...
Nick Kralevich [Thu, 9 Apr 2015 00:31:57 +0000 (00:31 +0000)]
am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '801411daca44a46338d8fa5e9015b85d94ecb471':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

9 years agoam 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master
Ying Wang [Thu, 9 Apr 2015 00:31:56 +0000 (00:31 +0000)]
am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master

* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
  Better way to package up the otatools-package.

9 years agoam 87df99f2: Merge "Fix the font size selection for recovery mode"
Tao Bao [Thu, 9 Apr 2015 00:31:32 +0000 (00:31 +0000)]
am 87df99f2: Merge "Fix the font size selection for recovery mode"

* commit '87df99f2f644802933cf937f19fe0ca269770e5f':
  Fix the font size selection for recovery mode

9 years agoam 2594d3d1: Merge "Remove unnecessary confusing use of ."
Ying Wang [Thu, 9 Apr 2015 00:31:30 +0000 (00:31 +0000)]
am 2594d3d1: Merge "Remove unnecessary confusing use of ."

* commit '2594d3d1214642a8da8cdff01562ec205b02935a':
  Remove unnecessary confusing use of $(intermediate).

9 years agoMerge "Fix the font size selection for recovery mode"
Tao Bao [Wed, 8 Apr 2015 23:55:28 +0000 (23:55 +0000)]
Merge "Fix the font size selection for recovery mode"

9 years agoMerge "Remove unnecessary confusing use of $(intermediate)."
Ying Wang [Wed, 8 Apr 2015 23:40:34 +0000 (23:40 +0000)]
Merge "Remove unnecessary confusing use of $(intermediate)."

9 years agoRemove unnecessary confusing use of $(intermediate).
Ying Wang [Wed, 8 Apr 2015 23:37:34 +0000 (16:37 -0700)]
Remove unnecessary confusing use of $(intermediate).

Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459

9 years agoam 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
Nick Kralevich [Wed, 8 Apr 2015 23:27:14 +0000 (23:27 +0000)]
am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '6d08a0d3fc108f80db47541b0ecbb89e99a99260':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

9 years agoresolved conflicts for merge of f5b9830b to stage-aosp-master
Ying Wang [Wed, 8 Apr 2015 23:21:58 +0000 (16:21 -0700)]
resolved conflicts for merge of f5b9830b to stage-aosp-master

Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3

9 years agoMerge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
Nick Kralevich [Wed, 8 Apr 2015 22:50:03 +0000 (22:50 +0000)]
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

9 years agoFix the font size selection for recovery mode
Tao Bao [Wed, 8 Apr 2015 21:14:43 +0000 (14:14 -0700)]
Fix the font size selection for recovery mode

shamu has a 560dpi density, which is between xxhdpi and xxxhdpi. It
deserves the large font (18x32), otherwise it falls back to use the
small one and makes it mostly unreadable under recovery mode. Amend
the list to include 560dpi and 400dpi that are higher than xhdpi.
Ideally we should map string formats back to numbers for easy
comparison (and to handle any high but odd density values).

Change-Id: Ie08d9ce5e1c8850ff30a79bcbfd1b89e971b7e07

9 years agoMerge "Better way to package up the otatools-package."
Ying Wang [Wed, 8 Apr 2015 20:53:45 +0000 (20:53 +0000)]
Merge "Better way to package up the otatools-package."

9 years agoBetter way to package up the otatools-package.
Ying Wang [Wed, 8 Apr 2015 19:24:37 +0000 (12:24 -0700)]
Better way to package up the otatools-package.

With this, you can easily add more executables, jars or shared libraries
to the package. Also now it automatically takes care of
32-bit-v.s.-64-bit library issue.

Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e

9 years agoAndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Nick Kralevich [Wed, 8 Apr 2015 19:21:54 +0000 (12:21 -0700)]
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

Some programs (cough sqlite cough) do an improper check to see if
HAVE_MALLOC_H is defined. Instead of defining it with no value,
define it with a value so those checks pass.

Needed for bug: 20099586

Change-Id: I4c293b2c1b5f4caad85ffc1fc34ac385bab23f5c

9 years agoChange the default multilib for host libraries to "both"
Colin Cross [Tue, 7 Apr 2015 22:11:37 +0000 (15:11 -0700)]
Change the default multilib for host libraries to "both"

Change host library builds to build for both architectures to
match device builds, removing the need for LOCAL_MULTILIB := both
in all the art library makefiles.

Change-Id: I2689f67c66f5055f93941f40b3e825127f693eca

9 years agoam bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:58:02 +0000 (16:58 +0000)]
am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071

* commit 'bf2474fba4dc446b4b580f4122d172e011c24ba1':
  fs_get_stats: add logging
  fs_config: add logging

9 years agoam 011a50e4: Merge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:47:54 +0000 (16:47 +0000)]
am 011a50e4: Merge changes I75d472ed,I6d681071

* commit '011a50e4e1cc7371d8fbd0ea08002241fe54a675':
  fs_get_stats: add logging
  fs_config: add logging

9 years agoMerge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:40:05 +0000 (16:40 +0000)]
Merge changes I75d472ed,I6d681071

* changes:
  fs_get_stats: add logging
  fs_config: add logging

9 years agofs_get_stats: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:19:27 +0000 (09:19 -0700)]
fs_get_stats: add logging

libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: I75d472ed142e32959cec78bf7babbf39d2b66cd2

9 years agofs_config: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:18:30 +0000 (09:18 -0700)]
fs_config: add logging

libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: I6d68107156962a6fec357ab99d23960c6852b026

9 years agoam f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:20:52 +0000 (21:20 +0000)]
am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
  Include vendorsetup scripts in order

9 years agoam b4b996a8: Merge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:10:43 +0000 (21:10 +0000)]
am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
  Include vendorsetup scripts in order

9 years agoMerge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:03:32 +0000 (21:03 +0000)]
Merge "Include vendorsetup scripts in order"

9 years agoam aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:29:29 +0000 (01:29 +0000)]
am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."

* commit 'aacc8bb4efb993e1d5ae539aa154c60d84a926dc':
  Convert bc depfiles to .P files.

9 years agoam 18ecae31: Merge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:19:52 +0000 (01:19 +0000)]
am 18ecae31: Merge "Convert bc depfiles to .P files."

* commit '18ecae31e62365d658406ff33a93358beeb87553':
  Convert bc depfiles to .P files.

9 years agoMerge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:09:55 +0000 (01:09 +0000)]
Merge "Convert bc depfiles to .P files."

9 years agoConvert bc depfiles to .P files.
Ying Wang [Fri, 3 Apr 2015 23:15:28 +0000 (16:15 -0700)]
Convert bc depfiles to .P files.

So you don't need clean step when a header file gets moved or deleted.

Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a

9 years agoam 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 22:23:06 +0000 (22:23 +0000)]
am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '7616909b5e24289eb7caecb4708f0c69a09a26f9':
  There's no such thing as _THREAD_SAFE.

9 years agoam 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 22:05:32 +0000 (22:05 +0000)]
am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '519751a88217e6fdc3b86979ffaf61ff03d92312':
  There's no such thing as _THREAD_SAFE.

9 years agoMerge "There's no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 21:55:06 +0000 (21:55 +0000)]
Merge "There's no such thing as _THREAD_SAFE."

9 years agoThere's no such thing as _THREAD_SAFE.
Elliott Hughes [Fri, 3 Apr 2015 20:41:10 +0000 (13:41 -0700)]
There's no such thing as _THREAD_SAFE.

At least, as far as I can tell from the internet and from grep in /usr/include
on a Mac.

Change-Id: I7f39bb2013db88e59f604e4491344d0d342e5f0b

9 years agoam d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:40:54 +0000 (20:40 +0000)]
am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."

* commit 'd9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
  Remove HAVE_PRINTF_ZD.

9 years agoam 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:30:45 +0000 (20:30 +0000)]
am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."

* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
  Remove HAVE_PRINTF_ZD.

9 years agoMerge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:16:21 +0000 (20:16 +0000)]
Merge "Remove HAVE_PRINTF_ZD."

9 years agoRemove HAVE_PRINTF_ZD.
Elliott Hughes [Fri, 3 Apr 2015 20:05:53 +0000 (13:05 -0700)]
Remove HAVE_PRINTF_ZD.

Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f

9 years agoam 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:59:00 +0000 (19:59 +0000)]
am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."

* commit '5d375b92fcedd9db052eb0ed3834361002e7699f':
  Remove HAVE_STRLCPY.

9 years agoam dbaee628: Merge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:48:11 +0000 (19:48 +0000)]
am dbaee628: Merge "Remove HAVE_STRLCPY."

* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
  Remove HAVE_STRLCPY.

9 years agoMerge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:42:05 +0000 (19:42 +0000)]
Merge "Remove HAVE_STRLCPY."

9 years agoam c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
Ying Wang [Fri, 3 Apr 2015 17:15:06 +0000 (17:15 +0000)]
am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."

* commit 'c35e7902679caf85d4295eca423b5df3dccaf79d':
  Move the inclusion of depfile to where it's generated.