git.osdn.net Git - android-x86/build.git/log

Compile each proto file separately

Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.

This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.

Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be

commit | commitdiff | tree

The Android Open Source Project [Tue, 18 Oct 2011 14:33:47 +0000 (07:33 -0700)]

am b5bd0a1b: Reconcile with ics-mr0-release

* commit 'b5bd0a1bc613fe018e37d9f96e94ad3044ea1815':
ICL18
ICL17B

commit | commitdiff | tree

The Android Open Source Project [Tue, 18 Oct 2011 14:31:50 +0000 (07:31 -0700)]

Reconcile with ics-mr0-release

Change-Id: I595da4205a7c60207644b445af0491a9aef5a9d3

commit | commitdiff | tree

The Android Automerger [Tue, 18 Oct 2011 13:28:36 +0000 (06:28 -0700)]

ICL18

commit | commitdiff | tree

The Android Automerger [Tue, 18 Oct 2011 13:27:14 +0000 (06:27 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Tue, 18 Oct 2011 03:11:30 +0000 (20:11 -0700)]

ICL17B

commit | commitdiff | tree

Ying Wang [Tue, 18 Oct 2011 03:08:18 +0000 (20:08 -0700)]

am 67d6305c: am 55370202: Remvoe whisperd from user_tags.mk.

* commit '67d6305c5c814e3a913a4cd69aafdc2f1410b22d':
Remvoe whisperd from user_tags.mk.

commit | commitdiff | tree

The Android Automerger [Tue, 18 Oct 2011 03:07:27 +0000 (20:07 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Ying Wang [Tue, 18 Oct 2011 03:06:51 +0000 (20:06 -0700)]

am 55370202: Remvoe whisperd from user_tags.mk.

* commit '5537020242a499e54c351ced962fe437ae1fc4d2':
Remvoe whisperd from user_tags.mk.

commit | commitdiff | tree

Ying Wang [Tue, 18 Oct 2011 00:59:29 +0000 (17:59 -0700)]

Remvoe whisperd from user_tags.mk.

Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469

Bug: 5473754

commit | commitdiff | tree

Maarten Hooft [Tue, 18 Oct 2011 00:40:22 +0000 (17:40 -0700)]

am b18d4069: am 068bf1a6: Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0

* commit 'b18d4069ff0372e603b4beed5789e614bd785fca':
Added Hindi to the list of languages to build under the full target.

commit | commitdiff | tree

Maarten Hooft [Tue, 18 Oct 2011 00:38:39 +0000 (17:38 -0700)]

am 068bf1a6: Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0

* commit '068bf1a601d94f9ce8ee9fe9a9fc125e36a7fd02':
Added Hindi to the list of languages to build under the full target.

commit | commitdiff | tree

Maarten Hooft [Tue, 18 Oct 2011 00:37:00 +0000 (17:37 -0700)]

Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0

commit | commitdiff | tree

Maarten Hooft [Mon, 17 Oct 2011 20:40:24 +0000 (13:40 -0700)]

Added Hindi to the list of languages to build under the full target.

Change-Id: I57201097e5ba1337249dde8b6efe704d75bf05b3

commit | commitdiff | tree

The Android Open Source Project [Mon, 17 Oct 2011 19:28:25 +0000 (12:28 -0700)]

am e8af1582: Reconcile with ics-factoryrom-release ics-mr0-release

* commit 'e8af1582006662f46afc3fcf39b0cd6874650377':
  ICL17
  ICL16B
  ICL16
  IFL10E
  ICL14
  IFL10D
  ICL13C

commit | commitdiff | tree

The Android Open Source Project [Mon, 17 Oct 2011 19:19:56 +0000 (12:19 -0700)]

Reconcile with ics-factoryrom-release ics-mr0-release

Change-Id: I924918872b02de185bee53d0516fc34b9d3b3f28

commit | commitdiff | tree

Dianne Hackborn [Mon, 17 Oct 2011 18:40:32 +0000 (11:40 -0700)]

am 9baabf8d: am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.

* commit '9baabf8d7e017e4f34fef2f4766671804063df28':
New PRODUCT_AAPT_PREF_CONFIG.

commit | commitdiff | tree

Dianne Hackborn [Mon, 17 Oct 2011 18:31:38 +0000 (11:31 -0700)]

am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.

* commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3':
New PRODUCT_AAPT_PREF_CONFIG.

commit | commitdiff | tree

The Android Automerger [Mon, 17 Oct 2011 13:28:18 +0000 (06:28 -0700)]

ICL17

commit | commitdiff | tree

The Android Automerger [Mon, 17 Oct 2011 13:27:08 +0000 (06:27 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sun, 16 Oct 2011 23:52:55 +0000 (16:52 -0700)]

ICL16B

commit | commitdiff | tree

The Android Automerger [Sun, 16 Oct 2011 23:51:16 +0000 (16:51 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sun, 16 Oct 2011 13:28:44 +0000 (06:28 -0700)]

ICL16

commit | commitdiff | tree

The Android Automerger [Sun, 16 Oct 2011 13:27:25 +0000 (06:27 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sat, 15 Oct 2011 19:51:47 +0000 (12:51 -0700)]

IFL10E

commit | commitdiff | tree

The Android Automerger [Sat, 15 Oct 2011 04:59:59 +0000 (21:59 -0700)]

ICL14

commit | commitdiff | tree

The Android Automerger [Sat, 15 Oct 2011 04:55:44 +0000 (21:55 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Dianne Hackborn [Sat, 15 Oct 2011 02:37:57 +0000 (19:37 -0700)]

New PRODUCT_AAPT_PREF_CONFIG.

To use the new aapt --preferred-configurations option. For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.

Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2

commit | commitdiff | tree

The Android Automerger [Sat, 15 Oct 2011 00:46:39 +0000 (17:46 -0700)]

IFL10D

commit | commitdiff | tree

The Android Automerger [Sat, 15 Oct 2011 00:43:09 +0000 (17:43 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

The Android Automerger [Fri, 14 Oct 2011 19:58:08 +0000 (12:58 -0700)]

ICL13C

commit | commitdiff | tree

The Android Open Source Project [Fri, 14 Oct 2011 17:55:17 +0000 (10:55 -0700)]

am bbda267d: Reconcile with ics-mr0-release

* commit 'bbda267de483446a3d458b35d9b2effaf1fa35f4':
ICL13B

commit | commitdiff | tree

The Android Open Source Project [Fri, 14 Oct 2011 17:52:11 +0000 (10:52 -0700)]

Reconcile with ics-mr0-release

Change-Id: Iddfb8ec409ada196db97434c2f85de1c6954cd1a

commit | commitdiff | tree

Ying Wang [Fri, 14 Oct 2011 16:26:57 +0000 (09:26 -0700)]

am 32fa8a31: Support to package prebuilt NDK libstlport_shared.so into apk

* commit '32fa8a313cf7b94396761dd09addb2d80848b336':
Support to package prebuilt NDK libstlport_shared.so into apk

commit | commitdiff | tree

Ying Wang [Fri, 14 Oct 2011 00:31:45 +0000 (17:31 -0700)]

Support to package prebuilt NDK libstlport_shared.so into apk

To package libstlport_shared.so, use the following syntax in the app
module definition:
LOCAL_NDK_STL_VARIANT := stlport_shared
LOCAL_NDK_VERSION := <num>

The rationale behind is:
The NDK prebiult libstlport_shared.so is intentionally different from
the system libstlport.so.
Essentially they are slightly different versions of the library so
shouldn't be mixed up.
libstlport.so is used by the system, but not exposed by the NDK, it is
routinely tweaked in various ways between platform releases, and there
is no guarantee that its ABI is stable, or that it will not be replaced
by something else in the future.
libstlport_shared.so is typically distributed with application packages,
and should not be part of the system.

Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22

commit | commitdiff | tree

The Android Automerger [Thu, 13 Oct 2011 23:59:53 +0000 (16:59 -0700)]

ICL13B

commit | commitdiff | tree

The Android Automerger [Thu, 13 Oct 2011 23:56:58 +0000 (16:56 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Open Source Project [Thu, 13 Oct 2011 14:07:06 +0000 (07:07 -0700)]

am df9a8ab1: Reconcile with ics-mr0-release

* commit 'df9a8ab186f1b8ed7df7a9a59932c6a8d0a04b25':
ICL13
ICL12B

commit | commitdiff | tree

The Android Open Source Project [Thu, 13 Oct 2011 14:04:45 +0000 (07:04 -0700)]

Reconcile with ics-mr0-release

Change-Id: I58ba7ea1f3e87dcc5fc13ce213a221a311dc4eff

commit | commitdiff | tree

The Android Automerger [Thu, 13 Oct 2011 13:30:07 +0000 (06:30 -0700)]

ICL13

commit | commitdiff | tree

The Android Automerger [Thu, 13 Oct 2011 13:27:08 +0000 (06:27 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Dima Zavin [Thu, 13 Oct 2011 03:42:55 +0000 (20:42 -0700)]

am 5fc85c6b: am 854233e9: core: remove the built fake packages (not installed) on installclean

* commit '5fc85c6bfe8f9789f12cc44cba123eadf98abce2':
core: remove the built fake packages (not installed) on installclean

commit | commitdiff | tree

Yuli Huang [Thu, 13 Oct 2011 01:39:20 +0000 (18:39 -0700)]

am 6f081c3a: am 5b124642: Remove PhotoEditor from mk file.

* commit '6f081c3a12750707851bd427fe4a4aa0abef5c27':
Remove PhotoEditor from mk file.

commit | commitdiff | tree

The Android Open Source Project [Thu, 13 Oct 2011 01:39:12 +0000 (18:39 -0700)]

am 3a8c9a11: Reconcile with ics-factoryrom-release ics-mr0-release

* commit '3a8c9a112e3cf44f79a4ccfc2e922e9495a85292':
  ICL12
  IFL10C
  IFL10B
  ICL11

commit | commitdiff | tree

Dima Zavin [Thu, 13 Oct 2011 01:39:12 +0000 (18:39 -0700)]

am eee20ca4: am 7dac5909: core: remove fake package timestamps on installclean

* commit 'eee20ca405c886773104ed063124b5f5a80c6f77':
core: remove fake package timestamps on installclean

commit | commitdiff | tree

Dima Zavin [Wed, 12 Oct 2011 20:50:40 +0000 (13:50 -0700)]

am 854233e9: core: remove the built fake packages (not installed) on installclean

* commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
core: remove the built fake packages (not installed) on installclean

commit | commitdiff | tree

Dima Zavin [Wed, 12 Oct 2011 20:34:25 +0000 (13:34 -0700)]

core: remove the built fake packages (not installed) on installclean

Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>

commit | commitdiff | tree

The Android Automerger [Wed, 12 Oct 2011 20:30:05 +0000 (13:30 -0700)]

ICL12B

commit | commitdiff | tree

Yuli Huang [Wed, 12 Oct 2011 16:37:35 +0000 (09:37 -0700)]

am 5b124642: Remove PhotoEditor from mk file.

* commit '5b124642b53c6545b8d353f50e05229350f89e13':
Remove PhotoEditor from mk file.

commit | commitdiff | tree

Yuli Huang [Wed, 12 Oct 2011 16:28:28 +0000 (00:28 +0800)]

Remove PhotoEditor from mk file.

Change-Id: Ia650e4dac0babb82fe2cb43073126f9e93b57362

commit | commitdiff | tree

The Android Open Source Project [Wed, 12 Oct 2011 15:48:41 +0000 (08:48 -0700)]

Reconcile with ics-factoryrom-release ics-mr0-release

Change-Id: Ic2b248f0ade713e7ba984cbe093afe50bc931ad2

commit | commitdiff | tree

The Android Automerger [Wed, 12 Oct 2011 14:06:18 +0000 (07:06 -0700)]

ICL12

commit | commitdiff | tree

The Android Automerger [Wed, 12 Oct 2011 13:22:34 +0000 (06:22 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Wed, 12 Oct 2011 01:08:39 +0000 (18:08 -0700)]

IFL10C

commit | commitdiff | tree

Dima Zavin [Wed, 12 Oct 2011 00:32:50 +0000 (17:32 -0700)]

am 7dac5909: core: remove fake package timestamps on installclean

* commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756':
core: remove fake package timestamps on installclean

commit | commitdiff | tree

Dima Zavin [Tue, 11 Oct 2011 22:54:10 +0000 (15:54 -0700)]

core: remove fake package timestamps on installclean

Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:14:15 +0000 (10:14 -0700)]

am d8945297: Merge "Use shell variable to eliminate in commands."

* commit 'd89452976b6d476896747a0136a1ad40e514e162':
Use shell variable to eliminate $(eval) in commands.

commit | commitdiff | tree

Android Git Automerger [Tue, 11 Oct 2011 17:12:21 +0000 (10:12 -0700)]

am 861348a4: Merge branch \'master\' of ssh://android-git:29418/platform/build

* commit '861348a4be2355e49f090271d7410fa850d5c7f8':

commit | commitdiff | tree

Ed Heyl [Tue, 11 Oct 2011 17:12:20 +0000 (10:12 -0700)]

am 738f053b: (-s ours) mr0 - do not merge

* commit '738f053bf3e00af8455d89dd4bb4724e83292e7e':
mr0 - do not merge

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:11:44 +0000 (10:11 -0700)]

Merge "Use shell variable to eliminate $(eval) in commands."

commit | commitdiff | tree

Android Git Automerger [Tue, 11 Oct 2011 17:10:35 +0000 (10:10 -0700)]

Merge branch 'master' of ssh://android-git:29418/platform/build

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)]

am e27347e7: Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"

* commit 'e27347e7a4e41e250b689d54ae911522623b2427':
Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)]

am 5e550018: Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."

* commit '5e55001859062d8a0b11f26347b39c5f012bd1f6':
Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:01:50 +0000 (10:01 -0700)]

Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"

commit | commitdiff | tree

Ying Wang [Tue, 11 Oct 2011 17:01:25 +0000 (10:01 -0700)]

Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."

commit | commitdiff | tree

The Android Automerger [Tue, 11 Oct 2011 15:46:03 +0000 (08:46 -0700)]

IFL10B

commit | commitdiff | tree

The Android Automerger [Tue, 11 Oct 2011 15:40:03 +0000 (08:40 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

Ed Heyl [Tue, 11 Oct 2011 13:40:06 +0000 (06:40 -0700)]

mr0 - do not merge

Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa

commit | commitdiff | tree

Ed Heyl [Tue, 11 Oct 2011 13:37:24 +0000 (06:37 -0700)]

ICL11

Change-Id: Icaeb0485cca6a5d1862c27df62fa29c9780dfa1d

commit | commitdiff | tree

The Android Open Source Project [Tue, 11 Oct 2011 11:34:45 +0000 (04:34 -0700)]

am 2b2bf398: Reconcile with ics-factoryrom-release

* commit '2b2bf3985ecb9ff9e0ebd51a62472fe6c6c1a39d':
IFL10

commit | commitdiff | tree

The Android Open Source Project [Tue, 11 Oct 2011 11:29:21 +0000 (04:29 -0700)]

Reconcile with ics-factoryrom-release

Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d

commit | commitdiff | tree

The Android Automerger [Tue, 11 Oct 2011 03:40:43 +0000 (20:40 -0700)]

IFL10

commit | commitdiff | tree

The Android Automerger [Tue, 11 Oct 2011 03:37:22 +0000 (20:37 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

Ying Wang [Sat, 8 Oct 2011 21:31:54 +0000 (14:31 -0700)]

Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds

Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d

commit | commitdiff | tree

Ying Wang [Mon, 10 Oct 2011 16:54:47 +0000 (09:54 -0700)]

Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.

Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf

commit | commitdiff | tree

The Android Open Source Project [Mon, 10 Oct 2011 14:30:21 +0000 (07:30 -0700)]

am 2df17b45: Reconcile with ics-factoryrom-release

* commit '2df17b458818b193660595bf967f0185fcabded6':
IFL09
IFL07B

commit | commitdiff | tree

The Android Open Source Project [Mon, 10 Oct 2011 14:27:25 +0000 (07:27 -0700)]

Reconcile with ics-factoryrom-release

Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321

commit | commitdiff | tree

The Android Automerger [Sun, 9 Oct 2011 20:31:47 +0000 (13:31 -0700)]

IFL09

commit | commitdiff | tree

The Android Automerger [Sun, 9 Oct 2011 20:28:28 +0000 (13:28 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

The Android Automerger [Sat, 8 Oct 2011 05:23:44 +0000 (22:23 -0700)]

IFL07B

commit | commitdiff | tree

The Android Automerger [Sat, 8 Oct 2011 05:22:43 +0000 (22:22 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

The Android Open Source Project [Sat, 8 Oct 2011 02:07:37 +0000 (19:07 -0700)]

am 226a54f0: Reconcile with ics-factoryrom-release

* commit '226a54f03cb888e023e9df48b4041ee28135bf41':
IFL07

commit | commitdiff | tree

The Android Open Source Project [Sat, 8 Oct 2011 02:06:12 +0000 (19:06 -0700)]

Reconcile with ics-factoryrom-release

Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292

commit | commitdiff | tree

The Android Automerger [Sat, 8 Oct 2011 01:15:16 +0000 (18:15 -0700)]

IFL07

commit | commitdiff | tree

The Android Automerger [Sat, 8 Oct 2011 01:12:00 +0000 (18:12 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

The Android Open Source Project [Fri, 7 Oct 2011 12:46:51 +0000 (05:46 -0700)]

am b606492a: Reconcile with honeycomb-LTE-release ics-factoryrom-release

* commit 'b606492a809ae0c23b17c24bd6b5930c3360eb98':
  IFL06C
  IFL06B
  HLK75D

commit | commitdiff | tree

The Android Open Source Project [Fri, 7 Oct 2011 12:35:30 +0000 (05:35 -0700)]

Reconcile with honeycomb-LTE-release ics-factoryrom-release

Change-Id: I1a4e39e9520e2574fa8e4cdcf37c4c05a0017895

commit | commitdiff | tree

The Android Automerger [Fri, 7 Oct 2011 05:44:00 +0000 (22:44 -0700)]

IFL06C

commit | commitdiff | tree

The Android Automerger [Fri, 7 Oct 2011 05:43:40 +0000 (22:43 -0700)]

merge in ics-factoryrom-release history after reset to ics-factoryrom

commit | commitdiff | tree

The Android Automerger [Fri, 7 Oct 2011 03:54:42 +0000 (20:54 -0700)]

IFL06B