OSDN Git Service
Ying Wang [Tue, 28 Sep 2010 04:28:20 +0000 (21:28 -0700)]
am
81fcba10: am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
81fcba102ea3953f525c1659914247747637ae7d'
* commit '
81fcba102ea3953f525c1659914247747637ae7d':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Tue, 28 Sep 2010 04:02:50 +0000 (21:02 -0700)]
am
b09173e7: am
30090e41: Set the intermediate dirs before using them.
Merge commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0'
* commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0':
Set the intermediate dirs before using them.
Ying Wang [Tue, 28 Sep 2010 03:33:29 +0000 (20:33 -0700)]
am
5cb94751: am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b'
* commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Dima Zavin [Tue, 28 Sep 2010 00:37:17 +0000 (17:37 -0700)]
core: Make fake packages have real installed files for proper dependencies
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
Ying Wang [Mon, 27 Sep 2010 23:33:43 +0000 (16:33 -0700)]
am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp
* commit '
1fdbf261a0d550baaed96f5461bb014754364c16':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Mon, 27 Sep 2010 23:25:11 +0000 (16:25 -0700)]
Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.
Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
Jean-Baptiste Queru [Sun, 26 Sep 2010 22:54:18 +0000 (15:54 -0700)]
Explicitly handle bluetooth files.
This also allows to separate smartphone and nonsmartphone variants.
Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
Ying Wang [Mon, 27 Sep 2010 21:59:13 +0000 (14:59 -0700)]
am
30090e41: Set the intermediate dirs before using them.
Merge commit '
30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp
* commit '
30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
Ying Wang [Mon, 27 Sep 2010 21:53:39 +0000 (14:53 -0700)]
Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
Ying Wang [Mon, 27 Sep 2010 21:10:53 +0000 (14:10 -0700)]
am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp
* commit '
9049e321aec53cfb23b63bbee7c21878a087350f':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Mon, 27 Sep 2010 21:07:17 +0000 (14:07 -0700)]
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.
Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
Ying Wang [Mon, 27 Sep 2010 19:05:56 +0000 (12:05 -0700)]
resolved conflicts for merge of
dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
Ying Wang [Mon, 27 Sep 2010 18:52:45 +0000 (11:52 -0700)]
am
02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '
0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp
* commit '
0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.
Ying Wang [Mon, 27 Sep 2010 17:37:25 +0000 (10:37 -0700)]
Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
Mathias Agopian [Mon, 27 Sep 2010 02:13:00 +0000 (19:13 -0700)]
Merge "add screencap to PRODUCT_PACKAGES"
Mathias Agopian [Mon, 27 Sep 2010 01:52:23 +0000 (18:52 -0700)]
add screencap to PRODUCT_PACKAGES
Change-Id: Ibe0a436e80082788dfab9d43a45c99d9a87633aa
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:50:59 +0000 (17:50 -0700)]
am
ef5490cf: am
97984c41: reconcile froyo-release into gingerbread
Merge commit '
ef5490cf650c65c3c5286a498b1bcdd4882ba237'
* commit '
ef5490cf650c65c3c5286a498b1bcdd4882ba237':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:39:11 +0000 (17:39 -0700)]
am
97984c41: reconcile froyo-release into gingerbread
Merge commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e' into gingerbread-plus-aosp
* commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:28:49 +0000 (17:28 -0700)]
reconcile froyo-release into gingerbread
Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d
Jean-Baptiste Queru [Sun, 26 Sep 2010 23:00:53 +0000 (16:00 -0700)]
Add some grandfathered prebuilts that were missed during the first pass
Change-Id: Ie812ad31c76d299c63ebe5c89c656866859425ed
Jean-Baptiste Queru [Sun, 26 Sep 2010 22:40:13 +0000 (15:40 -0700)]
Merge "Disable this check that was submitted by mistake."
Doug Zongker [Sun, 26 Sep 2010 22:17:44 +0000 (15:17 -0700)]
am
8317e664: am
96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '
8317e66433903badaec8ebd2b9ec2b8153f3d612'
* commit '
8317e66433903badaec8ebd2b9ec2b8153f3d612':
make info_dict and GetTypeAndDevice available to device extensions
Doug Zongker [Sun, 26 Sep 2010 22:09:54 +0000 (15:09 -0700)]
am
96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '
96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp
* commit '
96a57e737707d05333dced5b657c4ef21c44088a':
make info_dict and GetTypeAndDevice available to device extensions
Jean-Baptiste Queru [Sun, 26 Sep 2010 21:57:26 +0000 (14:57 -0700)]
Disable this check that was submitted by mistake.
There's still one device that doesn't build with this check enabled.
Change-Id: I962afe9c739df15e77ead30311c34be411674f53
Dima Zavin [Thu, 16 Sep 2010 07:25:16 +0000 (00:25 -0700)]
core: Add a phony package definition
This allows one to declare a meta-package that depends on a list
of modules. This is extremely useful for vendor provided prebulit
libraries where there is a big list of libraries/binaries to include.
Specifying that list in multiple places would be error prone and
eventually lead to very annoying bug hunts.
With a fake package, one does:
LOCAL_MODULE := my_fake_package
LOCAL_REQUIRED_MODULES := <list of required module names>
LOCAL_MODULE_TAGS := optional
include $(BUILD_PHONY_PACKAGE)
Change-Id: Idcfe91f6f2d6d886aba094981a70690e5a808bfc
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Fri, 24 Sep 2010 02:07:32 +0000 (19:07 -0700)]
core: don't add file deps for modules without any installed files
Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
Doug Zongker [Sun, 26 Sep 2010 21:57:41 +0000 (14:57 -0700)]
make info_dict and GetTypeAndDevice available to device extensions
Change-Id: I3aa04cb6d7988fc1fdd7f179634b09ceab5749fb
Jean-Baptiste Queru [Sun, 26 Sep 2010 21:17:38 +0000 (14:17 -0700)]
Merge "Issue an error when unknown files are added to ALL_PREBUILT"
Ying Wang [Sun, 26 Sep 2010 21:16:20 +0000 (14:16 -0700)]
am
b6579c68: am
1448b0b7: Remove emulator-based dexpreopt code
Merge commit '
b6579c68a75c34bd1054e31182ee98406185b1e8'
* commit '
b6579c68a75c34bd1054e31182ee98406185b1e8':
Remove emulator-based dexpreopt code
Ying Wang [Sun, 26 Sep 2010 20:47:45 +0000 (13:47 -0700)]
am
1448b0b7: Remove emulator-based dexpreopt code
Merge commit '
1448b0b7023a43ff4461cc66d25230c9b6502724' into gingerbread-plus-aosp
* commit '
1448b0b7023a43ff4461cc66d25230c9b6502724':
Remove emulator-based dexpreopt code
Jean-Baptiste Queru [Sun, 26 Sep 2010 20:05:41 +0000 (13:05 -0700)]
Issue an error when unknown files are added to ALL_PREBUILT
Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
Ying Wang [Sun, 26 Sep 2010 20:11:16 +0000 (13:11 -0700)]
Remove emulator-based dexpreopt code
Now dexpreopt is done on the host side.
Change-Id: I1ea1a5d1fac2531028e017364ef870abb7420be7
Ying Wang [Sat, 25 Sep 2010 01:27:29 +0000 (18:27 -0700)]
resolved conflicts for merge of
3453d5f3 to master
Change-Id: If23d2817b4d74d48632776923805c2141da82257
Ying Wang [Sat, 25 Sep 2010 01:12:12 +0000 (18:12 -0700)]
am
d56d69b6: Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Merge commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652' into gingerbread-plus-aosp
* commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652':
Fix dependency when switching between build variants with and without Proguard.
Ying Wang [Sat, 25 Sep 2010 01:08:30 +0000 (18:08 -0700)]
Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Ying Wang [Fri, 24 Sep 2010 22:57:47 +0000 (15:57 -0700)]
Andy McFadden [Fri, 24 Sep 2010 22:55:42 +0000 (15:55 -0700)]
Ying Wang [Fri, 24 Sep 2010 21:00:50 +0000 (14:00 -0700)]
am
19f9c1c2: Fix nothing-to-do build.
Merge commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp
* commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac':
Fix nothing-to-do build.
Ying Wang [Fri, 24 Sep 2010 20:56:45 +0000 (13:56 -0700)]
Fix nothing-to-do build.
Because .odex is always newer than the .jar file, so we should use "|" depdendency here.
Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
Andy McFadden [Fri, 24 Sep 2010 19:33:50 +0000 (12:33 -0700)]
am
6474811d: Fix sim-eng build.
Merge commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp
* commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2':
Fix sim-eng build.
Andy McFadden [Fri, 24 Sep 2010 19:04:17 +0000 (12:04 -0700)]
Fix sim-eng build.
Don't try to do the host build if we're configured for sim-eng. They
seem to be clashing, and it's redundant anyway.
Change-Id: I8e1a24b6e07d28701b32b6559ba39337b211264d
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:26:29 +0000 (11:26 -0700)]
am
954a5e60: am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'
* commit '
954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
Add a workaround for a platform JAR parsing bug.
Ying Wang [Fri, 24 Sep 2010 18:20:56 +0000 (11:20 -0700)]
Merge "Add wpa_supplicant.conf to the core.mk"
Ying Wang [Fri, 24 Sep 2010 18:14:16 +0000 (11:14 -0700)]
Add wpa_supplicant.conf to the core.mk
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug:
3003508
Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:09:40 +0000 (11:09 -0700)]
am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 17:58:04 +0000 (10:58 -0700)]
am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread
* commit '
7978d50edb9c4da0b8f4076412f092418da6e372':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 05:57:05 +0000 (22:57 -0700)]
Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.
If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.
Bug:
3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
Ying Wang [Fri, 24 Sep 2010 04:41:18 +0000 (21:41 -0700)]
am
bbbed9e1: am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2'
* commit '
bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 04:40:00 +0000 (21:40 -0700)]
am
4f9c4f4d: am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113'
* commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113':
Fix private vars for host-dex rules.
Ying Wang [Fri, 24 Sep 2010 01:05:38 +0000 (18:05 -0700)]
am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp
* commit '
02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 00:59:36 +0000 (17:59 -0700)]
Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
Ying Wang [Thu, 23 Sep 2010 18:48:38 +0000 (11:48 -0700)]
Fix dependency when switching between build variants with and without Proguard.
With this change, in a user build the dependency looks like:
package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar
While in an eng build:
package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar
Because package.apk is product-specific and removed when switching between
user and eng builds, it can always be built with the correct and up-to-date .dex file.
Bug:
3022484
Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
Ying Wang [Thu, 23 Sep 2010 23:42:38 +0000 (16:42 -0700)]
am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp
* commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
Fix private vars for host-dex rules.
Ying Wang [Thu, 23 Sep 2010 23:29:53 +0000 (16:29 -0700)]
Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
Dmitry Shmidt [Thu, 23 Sep 2010 18:56:34 +0000 (11:56 -0700)]
am
56de6843: am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
56de6843674898f72c87e4dc50156b9e9a26aee7'
* commit '
56de6843674898f72c87e4dc50156b9e9a26aee7':
user_tags: Remove 01-test target
Dmitry Shmidt [Thu, 23 Sep 2010 18:34:33 +0000 (11:34 -0700)]
am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0' into gingerbread-plus-aosp
* commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0':
user_tags: Remove 01-test target
Dmitry Shmidt [Thu, 23 Sep 2010 18:21:14 +0000 (11:21 -0700)]
Merge "user_tags: Remove 01-test target"
Dmitry Shmidt [Thu, 23 Sep 2010 18:06:42 +0000 (11:06 -0700)]
Merge "user_tags: Remove 01-test target" into gingerbread
Ying Wang [Thu, 23 Sep 2010 00:45:35 +0000 (17:45 -0700)]
resolved conflicts for merge of
67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
Ying Wang [Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for merge of
b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
Ying Wang [Thu, 23 Sep 2010 00:19:11 +0000 (17:19 -0700)]
resolved conflicts for merge of
9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
Ying Wang [Wed, 22 Sep 2010 23:57:01 +0000 (16:57 -0700)]
am
e7874c43: Integrate dexpreopt into the build system.
Merge commit '
e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit '
e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
Ying Wang [Fri, 17 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
Dmitry Shmidt [Wed, 22 Sep 2010 22:43:21 +0000 (15:43 -0700)]
user_tags: Remove 01-test target
Auto-merge: no
Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 22 Sep 2010 22:35:43 +0000 (15:35 -0700)]
user_tags: Remove 01-test target
Change-Id: I3a523cdd8c79a4428077e01d6f6b7bbcc6fe29ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Wed, 22 Sep 2010 21:11:49 +0000 (14:11 -0700)]
resolved conflicts for merge of
554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
Jesse Wilson [Wed, 22 Sep 2010 20:53:41 +0000 (13:53 -0700)]
am
77070aa7: am
ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '
77070aa757806d1617d707db4d2bd7931b2353fc'
* commit '
77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
Ying Wang [Wed, 22 Sep 2010 20:14:49 +0000 (13:14 -0700)]
am
38a3161d: String literal change.
Merge commit '
38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp
* commit '
38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
Ying Wang [Wed, 22 Sep 2010 19:56:13 +0000 (12:56 -0700)]
String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
Jesse Wilson [Wed, 22 Sep 2010 18:55:29 +0000 (11:55 -0700)]
am
ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '
ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit '
ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
Jesse Wilson [Wed, 22 Sep 2010 17:59:10 +0000 (10:59 -0700)]
Turn dalvikvm host builds on by default when linux is the host OS.
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
Doug Zongker [Wed, 22 Sep 2010 17:22:14 +0000 (10:22 -0700)]
am
7fa4a21e: (-s ours) am
780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '
7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c'
* commit '
7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c':
accommodate both new and old target-files when creating incrementals (do not merge)
Doug Zongker [Wed, 22 Sep 2010 17:18:33 +0000 (10:18 -0700)]
am
780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '
780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp
* commit '
780c2372706c5250079cb7d759f6530691dd9143':
accommodate both new and old target-files when creating incrementals (do not merge)
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals
(cherry-picked from gingerbread.)
Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
Doug Zongker [Wed, 22 Sep 2010 03:10:32 +0000 (20:10 -0700)]
resolved conflicts for merge of
e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
Brian Swetland [Wed, 22 Sep 2010 00:44:08 +0000 (17:44 -0700)]
Doug Zongker [Wed, 22 Sep 2010 00:25:59 +0000 (17:25 -0700)]
am
ad806982: arg: system_size, not system_img
Merge commit '
ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp
* commit '
ad806982c12b64d8dff040f5c9a444d810d7694c':
arg: system_size, not system_img
Doug Zongker [Wed, 22 Sep 2010 00:22:14 +0000 (17:22 -0700)]
arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
Doug Zongker [Wed, 22 Sep 2010 00:15:17 +0000 (17:15 -0700)]
Merge "fall back to MTD if no recovery.fstab is present"
Ying Wang [Tue, 21 Sep 2010 23:52:28 +0000 (16:52 -0700)]
Merge "Add a new layer generic_no_telephony.mk"
Ying Wang [Tue, 21 Sep 2010 23:08:26 +0000 (16:08 -0700)]
Add a new layer generic_no_telephony.mk
Bug:
2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
Brian Swetland [Tue, 21 Sep 2010 23:16:47 +0000 (16:16 -0700)]
am
c1a1aa1e: deal with gps renaming
Merge commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18' into gingerbread-plus-aosp
* commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18':
deal with gps renaming
Doug Zongker [Tue, 21 Sep 2010 23:12:55 +0000 (16:12 -0700)]
fall back to MTD if no recovery.fstab is present
Needed for non-device builds (like for the emulator) to work.
Change-Id: I5fdbfb3af34821811744e8ce5bf1eff8df344c73
Brian Swetland [Tue, 21 Sep 2010 22:58:12 +0000 (15:58 -0700)]
deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
Doug Zongker [Tue, 21 Sep 2010 21:46:48 +0000 (14:46 -0700)]
am
714633b1: (-s ours) am
c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit '
714633b13f00d07afb78838a2d27c95cdd78973f'
* commit '
714633b13f00d07afb78838a2d27c95cdd78973f':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Doug Zongker [Tue, 21 Sep 2010 21:37:19 +0000 (14:37 -0700)]
am
c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit '
c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp
* commit '
c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Doug Zongker [Tue, 21 Sep 2010 21:25:51 +0000 (14:25 -0700)]
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes. Add support for "emmc" fstab partition type to
edify_generator.
Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
Doug Zongker [Tue, 21 Sep 2010 01:04:41 +0000 (18:04 -0700)]
support for per-partition fs_type
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
(Cherrypicked from gingerbread w/some edits to resolve conflicts.)
Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
android-build SharedAccount [Tue, 21 Sep 2010 20:58:39 +0000 (13:58 -0700)]
FRG83
Change-Id: I8d8fa5700e05930be8550f536561498010725fb4
Doug Zongker [Tue, 21 Sep 2010 18:41:05 +0000 (11:41 -0700)]
am
ed2d3f42: (-s ours) am
258bf46e: support for per-partition fs_type (do not merge)
Merge commit '
ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be'
* commit '
ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be':
support for per-partition fs_type (do not merge)
Doug Zongker [Tue, 21 Sep 2010 18:37:10 +0000 (11:37 -0700)]
am
258bf46e: support for per-partition fs_type (do not merge)
Merge commit '
258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp
* commit '
258bf46ea6bb4f25d01fab1b783238589e5bbec4':
support for per-partition fs_type (do not merge)
Doug Zongker [Tue, 21 Sep 2010 01:04:41 +0000 (18:04 -0700)]
support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
Steve Howard [Mon, 20 Sep 2010 18:57:10 +0000 (11:57 -0700)]
am
1a297b84: am
1020d271: Add new downloads UI to core build.
Merge commit '
1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'
* commit '
1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
Add new downloads UI to core build.
Steve Howard [Mon, 20 Sep 2010 18:52:57 +0000 (11:52 -0700)]
am
1020d271: Add new downloads UI to core build.
Merge commit '
1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '
1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
Steve Howard [Fri, 17 Sep 2010 01:15:02 +0000 (18:15 -0700)]
Add new downloads UI to core build.
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
Joe Onorato [Sun, 19 Sep 2010 16:21:27 +0000 (09:21 -0700)]
am
bf17772c: am
ad05677b: Brian\'s vendor/ change requires a clean build.
Merge commit '
bf17772cae2a11cf4039e8652aee3b96af7a739f'
* commit '
bf17772cae2a11cf4039e8652aee3b96af7a739f':
Brian's vendor/ change requires a clean build.
Joe Onorato [Sun, 19 Sep 2010 16:12:39 +0000 (09:12 -0700)]
am
ad05677b: Brian\'s vendor/ change requires a clean build.
Merge commit '
ad05677b0d02a54af34370e8b237aa86f0d627f4' into gingerbread-plus-aosp
* commit '
ad05677b0d02a54af34370e8b237aa86f0d627f4':
Brian's vendor/ change requires a clean build.
Joe Onorato [Sun, 19 Sep 2010 16:04:23 +0000 (12:04 -0400)]
Brian's vendor/ change requires a clean build.
Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c