From edfd5385dec7c4f45e278c44b165272a8730eedd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Aug 2012 12:43:26 -0700 Subject: [PATCH 1/6] JRO03V --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2ad4940565..9577a080b5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JRO03C +export BUILD_ID=JRO03V From 9905256bea7906095b26db241b636cb9f814be31 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Aug 2012 14:30:05 -0700 Subject: [PATCH 2/6] JRO03V --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b808c76bba..9577a080b5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JRO03U +export BUILD_ID=JRO03V From bdfc1bb1ed82c4470c36188597848bfa4474bce4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Aug 2012 12:07:12 -0700 Subject: [PATCH 3/6] JZO54B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f56f2e0dd3..fb99a9f25d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JZO54 +export BUILD_ID=JZO54B From ef6f4f6b9c1562f6ec62aca9b5f891f94043a26d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 9 Aug 2012 12:20:16 -0700 Subject: [PATCH 4/6] Add make_ext4fs to all builds make_ext4fs is needed for all builds because ASEC containers use it now. Any product not having this will not be able to create an ASEC container. (cherry-pick of 720479ea7e6307648c56f61d82ac12d65f218dda) Bug: 6960586 Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01 --- target/product/core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/core.mk b/target/product/core.mk index 688c80684d..b7934b34e4 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -114,6 +114,7 @@ PRODUCT_PACKAGES := \ libwebrtc_audio_preprocessing \ libwilhelm \ libz \ + make_ext4fs \ mdnsd \ requestsync \ screencap \ From 3c47c4ee72e7ba6e071f184bede89734f80fb4fe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Aug 2012 16:00:32 -0700 Subject: [PATCH 5/6] JZO54C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fb99a9f25d..b63bc81deb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JZO54B +export BUILD_ID=JZO54C From f33d47b53ced4fe642e32a7e98e22c75619a17bb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Aug 2012 13:54:56 -0700 Subject: [PATCH 6/6] JZO54D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b63bc81deb..8957e4f744 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JZO54C +export BUILD_ID=JZO54D