Commit graph

22682 commits

Author SHA1 Message Date
Tao Bao
915e47aad5 am 948f67b0: am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit '948f67b0e7b3863488fd4a12a6797311d4c30508':
  Dump fingerprints into recovery log
2015-04-10 04:35:11 +00:00
Tao Bao
948f67b0e7 am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit 'd0ca05493bfe06cf166e4e215cd9bf38936fb344':
  Dump fingerprints into recovery log
2015-04-10 02:23:31 +00:00
Tao Bao
d0ca05493b am 8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit '8c76d1e07a819b0a127ae0df533b627995cf49ff':
  Dump fingerprints into recovery log
2015-04-10 02:12:59 +00:00
Tao Bao
8c76d1e07a Merge "Dump fingerprints into recovery log" 2015-04-10 02:04:35 +00:00
Tao Bao
6c55a8adc8 Dump fingerprints into recovery log
No more guessing. We should have the info for OTA issues diagnosis.

Change-Id: I0ce919434444ab16a38cc7af818e64785509b0fb
2015-04-09 17:36:05 -07:00
Colin Cross
6afd8a897c am 9c3d4388: am c0a70d88: am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
* commit '9c3d43886e4d788084767a790fc0c7528ca19d79':
  Change the default multilib for host libraries to "both"
2015-04-09 21:17:07 +00:00
Mike Lockwood
70e60b63a0 Merge "Add BluetoothMidiService to generic_no_telephony.mk" 2015-04-09 21:05:11 +00:00
Colin Cross
9c3d43886e 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"
2015-04-09 21:00:49 +00:00
Colin Cross
c0a70d889f am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
* commit '7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
  Change the default multilib for host libraries to "both"
2015-04-09 20:55:01 +00:00
Colin Cross
7c2bfaf329 Merge "Change the default multilib for host libraries to "both"" 2015-04-09 20:47:16 +00:00
Ying Wang
61357b41d6 am 1844a1ee: am 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '1844a1ee28d69467a1cd5a7d03fd6f6a3616cd7b':
  Remove ancient ranlib workaround on Mac OS X.
2015-04-09 17:47:21 +00:00
Ying Wang
1844a1ee28 am 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '50010e96b68468692f5f110a04c40d66898131ab':
  Remove ancient ranlib workaround on Mac OS X.
2015-04-09 17:26:41 +00:00
Ying Wang
50010e96b6 am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '42a3e879b63abeadf8fd09403ebb084a3ead887b':
  Remove ancient ranlib workaround on Mac OS X.
2015-04-09 17:16:44 +00:00
Ying Wang
42a3e879b6 Merge "Remove ancient ranlib workaround on Mac OS X." 2015-04-09 17:07:44 +00:00
Ying Wang
aaf9a5b0cc 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
2015-04-09 10:06:33 -07:00
Ying Wang
4972d195dd 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
2015-04-09 09:45:39 -07:00
Yohann Roussel
597bdd70c1 Merge "Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"" 2015-04-09 11:44:56 +00:00
Yohann Roussel
e163b4e2e8 Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
This reverts commit d191667006.

Build server are no longer giving outdated options.

Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
2015-04-09 10:10:21 +00:00
Roozbeh Pournader
cf6a4d8004 Merge "Add hyphenation patterns to generic_no_telephony.mk." 2015-04-09 02:12:54 +00:00
Tao Bao
65677cf0ee am 9e275b1d: am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '9e275b1d8b1d729761dc2e873735ea0f14c29b11':
  Fix the font size selection for recovery mode
2015-04-09 01:13:12 +00:00
Ying Wang
c8a1553c3c am 58a7e3ac: am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '58a7e3acacea8b458cac8d46edf084d7ddbf8ad3':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 01:13:10 +00:00
Nick Kralevich
8d36507971 am ac14f971: am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
* commit 'ac14f9710b0c6405c19d2eff6f435c51dea1e4f5':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
2015-04-09 01:13:07 +00:00
Ying Wang
d9509e970c resolved conflicts for merge of 133415d5 to master
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
2015-04-08 18:08:46 -07:00
Tao Bao
9e275b1d8b am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
  Fix the font size selection for recovery mode
2015-04-09 00:38:47 +00:00
Ying Wang
58a7e3acac am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit 'b78a6d7b2cc97431e666228eee5f82eec4e49be8':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 00:38:45 +00:00
Nick Kralevich
ac14f9710b 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.
2015-04-09 00:31:57 +00:00
Ying Wang
133415d551 am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master
* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
  Better way to package up the otatools-package.
2015-04-09 00:31:56 +00:00
Tao Bao
083c1d7f7d am 87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '87df99f2f644802933cf937f19fe0ca269770e5f':
  Fix the font size selection for recovery mode
2015-04-09 00:31:32 +00:00
Ying Wang
b78a6d7b2c am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '2594d3d1214642a8da8cdff01562ec205b02935a':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 00:31:30 +00:00
Tao Bao
87df99f2f6 Merge "Fix the font size selection for recovery mode" 2015-04-08 23:57:31 +00:00
Ying Wang
2594d3d121 Merge "Remove unnecessary confusing use of $(intermediate)." 2015-04-08 23:40:34 +00:00
Ying Wang
62925a993a Remove unnecessary confusing use of $(intermediate).
Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
2015-04-08 16:37:34 -07:00
Nick Kralevich
801411daca 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.
2015-04-08 23:27:14 +00:00
Ying Wang
4acabe0fd8 resolved conflicts for merge of f5b9830b to stage-aosp-master
Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3
2015-04-08 16:21:58 -07:00
Nick Kralevich
6d08a0d3fc Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value." 2015-04-08 22:50:03 +00:00
Tao Bao
abbc911632 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
2015-04-08 15:39:33 -07:00
Rom Lemarchand
324784ab85 Merge "Omit ramdisk from boot.img if building without ramdisk" 2015-04-08 22:27:03 +00:00
Rom Lemarchand
f9c9266c75 Omit ramdisk from boot.img if building without ramdisk
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
2015-04-08 15:11:47 -07:00
Ying Wang
f5b9830bc9 Merge "Better way to package up the otatools-package." 2015-04-08 20:53:45 +00:00
Ying Wang
c45a47b5f3 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
2015-04-08 12:40:37 -07:00
Nick Kralevich
9b44afb452 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
2015-04-08 12:21:54 -07:00
Joseph Wen
e1c8bdf8d8 Merge "Add StatementService to the build" 2015-04-08 18:47:07 +00:00
Colin Cross
9d59f41776 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
2015-04-08 18:09:52 +00:00
Ying Wang
8a0d53e7f5 Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-04-08 09:54:34 -07:00
Ying Wang
e3b60664ea Merge "Consolidate the nanopb-c and regular protobuf build rules." 2015-04-08 16:22:17 +00:00
Joseph Wen
3a260d6860 Add StatementService to the build
- this is related to IntentFilter auto verification in Framework

Change-Id: I83d1c4bcc7be7992509348098cc320e38efea862
2015-04-08 10:55:27 -04:00
Yohann Roussel
a510428ead Merge changes from topic 'jack-server'
* changes:
  Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
  Don't call Jack directly, use the script instead
2015-04-08 13:20:48 +00:00
Yohann Roussel
d191667006 Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.

Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
2015-04-07 23:43:36 +02:00
Yohann Roussel
abee3a9f41 Don't call Jack directly, use the script instead
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
2015-04-07 23:42:53 +02:00
Ying Wang
faeb693174 Consolidate the nanopb-c and regular protobuf build rules.
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
2015-04-07 12:49:50 -07:00