From 9f78b403c66b458eccf7b1b7ff8d02642763f20b Mon Sep 17 00:00:00 2001 From: James Dong Date: Fri, 4 Nov 2011 13:55:01 -0700 Subject: [PATCH 1/7] Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4 related-to-bug: 5566262 --- target/product/core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index d45ea1731..3b05659cc 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -90,9 +90,9 @@ PRODUCT_PACKAGES := \ libspeexresampler \ libsqlite_jni \ libssl \ + libstagefright_soft_h264dec \ libstagefright_soft_aacdec \ libstagefright_soft_amrdec \ - libstagefright_soft_avcdec \ libstagefright_soft_g711dec \ libstagefright_soft_mp3dec \ libstagefright_soft_mpeg4dec \ From d6386eb7ab295a0969cc684bef3c7a446d9d7d35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 4 Nov 2011 15:18:00 -0700 Subject: [PATCH 2/7] ITL35 --- 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 6e08d0348..f08cea6b0 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=ITL34B +export BUILD_ID=ITL35 From dcfe107755011f81e4dd41683e9216f914a411ad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 4 Nov 2011 15:42:21 -0700 Subject: [PATCH 3/7] ICL35 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..2b62532b4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := ICS_MR0 -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=ICL35 From 9c72360185b9a9c5eb7040857f53a7b73867c9e6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 4 Nov 2011 22:19:16 -0700 Subject: [PATCH 4/7] ITL35B --- 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 f08cea6b0..3a868ac36 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=ITL35 +export BUILD_ID=ITL35B From c2f9b684169b256806dd3f16e4063a19ac1a9244 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 5 Nov 2011 00:33:42 -0700 Subject: [PATCH 5/7] ICL36 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..235cd8979 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := ICS_MR0 -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=ICL36 From b577e85cd3f9e36d7633f8f3b61961dc6de8df15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 6 Nov 2011 06:28:42 -0800 Subject: [PATCH 6/7] ICL37 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..e5851bec2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := ICS_MR0 -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=ICL37 From 2fc572383c9cebfb610a0c91db70353bdf6be099 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 7 Nov 2011 06:28:08 -0800 Subject: [PATCH 7/7] ICL38 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..2cb78f53f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := ICS_MR0 -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=ICL38