Hi,
The next set of patches will help in building Android source code out of the box using Linaro GCC 4.5/4.6 toolchains. The patches basically try to circumvent the build problem caused by stricter GCC 4.5/4.6. These patches are based on remotes/m/linaro_android_2.3.2 branch.
Regards, Sachin
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I471e831d569b37345752d788f5a213ffd6616690 --- core/config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/core/config.mk b/core/config.mk index a76aec8..45100fb 100644 --- a/core/config.mk +++ b/core/config.mk @@ -98,7 +98,7 @@ COMMON_JAVA_PACKAGE_SUFFIX := .jar COMMON_ANDROID_PACKAGE_SUFFIX := .apk
# list of flags to turn specific warnings in to errors -TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point +TARGET_ERROR_FLAGS :=
# TODO: do symbol compression TARGET_COMPRESS_MODULE_SYMBOLS := false
Hmm ... I think disabling Werror completely is not something we should take into our main android branches. Sachin, were there just too many issues in dalvik to fix them properly?
On Wed, Mar 16, 2011 at 6:16 AM, Sachin Kamat sachin.kamat@linaro.org wrote:
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I471e831d569b37345752d788f5a213ffd6616690
core/config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/core/config.mk b/core/config.mk index a76aec8..45100fb 100644 --- a/core/config.mk +++ b/core/config.mk @@ -98,7 +98,7 @@ COMMON_JAVA_PACKAGE_SUFFIX := .jar COMMON_ANDROID_PACKAGE_SUFFIX := .apk
# list of flags to turn specific warnings in to errors -TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point +TARGET_ERROR_FLAGS :=
# TODO: do symbol compression TARGET_COMPRESS_MODULE_SYMBOLS := false -- 1.7.1
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I8fa29112df35fea05d034ef4d08559135c5e327a --- vm/Dvm.mk | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/vm/Dvm.mk b/vm/Dvm.mk index 0867ffa..7b8a39d 100644 --- a/vm/Dvm.mk +++ b/vm/Dvm.mk @@ -264,7 +264,6 @@ MTERP_ARCH_KNOWN := false ifeq ($(dvm_arch),arm) #dvm_arch_variant := armv7-a #LOCAL_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfp - LOCAL_CFLAGS += -Werror MTERP_ARCH_KNOWN := true # Select architecture-specific sources (armv4t, armv5te etc.) LOCAL_SRC_FILES += \
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I01286388a1bef915cb06adae862d9f3a0397b059 --- elfcopy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/elfcopy.c b/elfcopy.c index ed1e6ce..da054c7 100644 --- a/elfcopy.c +++ b/elfcopy.c @@ -2456,7 +2456,6 @@ update_symbol_values(Elf *elf, GElf_Ehdr *ehdr, out why and also figure out whether the zero value should have been adjusted, after all. */ - ASSERT(!(shdr_info[sym->st_shndx].shdr.sh_flags & SHF_ALLOC)); ASSERT(shdr_info[i].shdr.sh_type == SHT_SYMTAB); }
On Wednesday 16 March 2011, Sachin Kamat wrote:
--- a/elfcopy.c +++ b/elfcopy.c @@ -2456,7 +2456,6 @@ update_symbol_values(Elf *elf, GElf_Ehdr *ehdr, out why and also figure out whether the zero value should have been adjusted, after all. */
ASSERT(!(shdr_info[sym->st_shndx].shdr.sh_flags & SHF_ALLOC)); ASSERT(shdr_info[i].shdr.sh_type == SHT_SYMTAB); }
Like the -Werror changes that Alexander commented on, this change circumvents the error output, but does not address the underlying problem. If you remove an assertion, that at least needs a very good explanation why the assertion was incorrect in the first place.
Arnd
Hi Arnd, Alexander,
Some of the work arounds are just make shift solutions so that those dependent on the build can carry on with their work. Meanwhile as you guys said, the underlying problem needs to be addressed and fixed. This might take a while.
Regards Sachin
On 16 March 2011 17:17, Arnd Bergmann arnd@arndb.de wrote:
On Wednesday 16 March 2011, Sachin Kamat wrote:
--- a/elfcopy.c +++ b/elfcopy.c @@ -2456,7 +2456,6 @@ update_symbol_values(Elf *elf, GElf_Ehdr *ehdr, out why and also figure out whether the zero
value should have
been adjusted, after all. */
ASSERT(!(shdr_info[sym->st_shndx].shdr.sh_flags& SHF_ALLOC));
ASSERT(shdr_info[i].shdr.sh_type == SHT_SYMTAB); }Like the -Werror changes that Alexander commented on, this change circumvents the error output, but does not address the underlying problem. If you remove an assertion, that at least needs a very good explanation why the assertion was incorrect in the first place.
Arnd
Ack, we discussed this today in android meeting and will take your patches to a special toolchain branch that allows us to experiement with 4.5/4.6 toolchain while not hiding the underlying problems. Thanks for your work!
On Wed, Mar 16, 2011 at 1:01 PM, Sachin Kamat sachin.kamat@linaro.org wrote:
Hi Arnd, Alexander,
Some of the work arounds are just make shift solutions so that those dependent on the build can carry on with their work. Meanwhile as you guys said, the underlying problem needs to be addressed and fixed. This might take a while.
Regards Sachin
On 16 March 2011 17:17, Arnd Bergmann arnd@arndb.de wrote:
On Wednesday 16 March 2011, Sachin Kamat wrote:
--- a/elfcopy.c +++ b/elfcopy.c @@ -2456,7 +2456,6 @@ update_symbol_values(Elf *elf, GElf_Ehdr *ehdr, out why and also figure out whether the zero value should have been adjusted, after all. */
- ASSERT(!(shdr_info[sym->st_shndx].shdr.sh_flags
& SHF_ALLOC)); ASSERT(shdr_info[i].shdr.sh_type == SHT_SYMTAB); }
Like the -Werror changes that Alexander commented on, this change circumvents the error output, but does not address the underlying problem. If you remove an assertion, that at least needs a very good explanation why the assertion was incorrect in the first place.
Arnd
-- With warm regards, Sachin
On 16/03/11 at 05:31pm, Sachin Kamat wrote:
Hi Arnd, Alexander,
Some of the work arounds are just make shift solutions so that those dependent on the build can carry on with their work. Meanwhile as you guys said, the underlying problem needs to be addressed and fixed. This might take a while.
Maybe a comment just above each of these 'make shift solutions' will help you a) locate them later to fix up and b) give commentary on why you are temporarily doing them.
Regards Sachin
Regards, Jamie.
On 16 March 2011 17:17, Arnd Bergmann arnd@arndb.de wrote:
On Wednesday 16 March 2011, Sachin Kamat wrote:
--- a/elfcopy.c +++ b/elfcopy.c @@ -2456,7 +2456,6 @@ update_symbol_values(Elf *elf, GElf_Ehdr *ehdr, out why and also figure out whether the zero
value should have
been adjusted, after all. */
ASSERT(!(shdr_info[sym->st_shndx].shdr.sh_flags& SHF_ALLOC));
ASSERT(shdr_info[i].shdr.sh_type == SHT_SYMTAB); }Like the -Werror changes that Alexander commented on, this change circumvents the error output, but does not address the underlying problem. If you remove an assertion, that at least needs a very good explanation why the assertion was incorrect in the first place.
Arnd-- With warm regards, Sachin
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: Ibebec39dfd1e083a052870927a4129fdeca7cf8a --- src/images/SkFlipPixelRef.cpp | 2 +- src/images/SkImageRef_GlobalPool.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/images/SkFlipPixelRef.cpp b/src/images/SkFlipPixelRef.cpp index 8d0f15a..bdf4d0a 100644 --- a/src/images/SkFlipPixelRef.cpp +++ b/src/images/SkFlipPixelRef.cpp @@ -74,7 +74,7 @@ SkPixelRef* SkFlipPixelRef::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkFlipPixelRef, (buffer)); }
-static SkPixelRef::Registrar::Registrar reg("SkFlipPixelRef", +static SkPixelRef::Registrar reg("SkFlipPixelRef", SkFlipPixelRef::Create);
/////////////////////////////////////////////////////////////////////////////// diff --git a/src/images/SkImageRef_GlobalPool.cpp b/src/images/SkImageRef_GlobalPool.cpp index 1f0bc43..15d3f0d 100644 --- a/src/images/SkImageRef_GlobalPool.cpp +++ b/src/images/SkImageRef_GlobalPool.cpp @@ -50,7 +50,7 @@ SkPixelRef* SkImageRef_GlobalPool::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkImageRef_GlobalPool, (buffer)); }
-static SkPixelRef::Registrar::Registrar reg("SkImageRef_GlobalPool", +static SkPixelRef::Registrar reg("SkImageRef_GlobalPool", SkImageRef_GlobalPool::Create);
///////////////////////////////////////////////////////////////////////////////
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I2cd4ccdf7edc39b025ef39bd5db0154c616aa5a9 --- WebKit/android/nav/FindCanvas.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp index d8e908b..15cce43 100644 --- a/WebKit/android/nav/FindCanvas.cpp +++ b/WebKit/android/nav/FindCanvas.cpp @@ -98,7 +98,7 @@ GlyphSet::~GlyphSet() { // part of mLowerGlyphs }
-GlyphSet::GlyphSet& GlyphSet::operator=(GlyphSet& src) { +GlyphSet& GlyphSet::operator=(GlyphSet& src) { mTypeface = src.mTypeface; mCount = src.mCount; if (mCount > MAX_STORAGE_COUNT) {
On Wed, 2011-03-16 at 10:46 +0530, Sachin Kamat wrote:
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I2cd4ccdf7edc39b025ef39bd5db0154c616aa5a9
WebKit/android/nav/FindCanvas.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Very cool work! One nit: Would you mind adding a more descriptive changelog to all of these patches? (ie: what is the error without the patch, why its a correct change, etc).
thanks -john
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: Id31f863427cd3a7d5d5abced71de78a76ae3d028 --- libs/utils/RefBase.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libs/utils/RefBase.cpp b/libs/utils/RefBase.cpp index 0bd1af4..d28b751 100644 --- a/libs/utils/RefBase.cpp +++ b/libs/utils/RefBase.cpp @@ -480,7 +480,7 @@ void RefBase::weakref_type::printRefs() const
void RefBase::weakref_type::trackMe(bool enable, bool retain) { - static_cast<const weakref_impl*>(this)->trackMe(enable, retain); + static_cast<weakref_impl*>(this)->trackMe(enable, retain); }
RefBase::weakref_type* RefBase::createWeak(const void* id) const
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I61a9d5c9b5aef8358a04d0e1ac8964f905f0970a --- Android.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Android.mk b/Android.mk index 331d794..181f115 100644 --- a/Android.mk +++ b/Android.mk @@ -32,7 +32,7 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif
-LOCAL_CFLAGS += -Wall -Werror +LOCAL_CFLAGS += -Wall
LOCAL_LDLIBS += -lpthread
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I2c4699686ada362b43b836ace61636fc000720d3 --- NativeCode.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/NativeCode.mk b/NativeCode.mk index 4c6ffa5..7b56aef 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -85,7 +85,7 @@ core_static_libraries := $(sort $(LOCAL_STATIC_LIBRARIES))
include $(CLEAR_VARS)
-LOCAL_CFLAGS += -Wall -Wextra -Werror +LOCAL_CFLAGS += -Wall -Wextra
ifeq ($(TARGET_ARCH),arm) # Ignore "note: the mangling of 'va_list' has changed in GCC 4.4"
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I39652f14b362c42ebc2ceb37952d8e57cf89692c --- opensles/libopensles/Android.mk | 2 +- opensles/libopensles/IAndroidEffect.c | 130 ------------------------------- opensles/libopensles/IAndroidEffect.cpp | 130 +++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 opensles/libopensles/IAndroidEffect.c create mode 100644 opensles/libopensles/IAndroidEffect.cpp
diff --git a/opensles/libopensles/Android.mk b/opensles/libopensles/Android.mk index 64e9b6f..f965d3e 100644 --- a/opensles/libopensles/Android.mk +++ b/opensles/libopensles/Android.mk @@ -56,7 +56,7 @@ LOCAL_SRC_FILES:= \ CEngine.c \ COutputMix.c \ IAndroidConfiguration.c \ - IAndroidEffect.c \ + IAndroidEffect.cpp \ IAndroidEffectCapabilities.c \ IAndroidEffectSend.c \ IBassBoost.c \ diff --git a/opensles/libopensles/IAndroidEffect.c b/opensles/libopensles/IAndroidEffect.c deleted file mode 100644 index b934c15..0000000 --- a/opensles/libopensles/IAndroidEffect.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* Android Effect implementation */ - -#include "sles_allinclusive.h" - - -static SLresult IAndroidEffect_CreateEffect(SLAndroidEffectItf self, - SLInterfaceID effectImplementationId) { - - SL_ENTER_INTERFACE - - IAndroidEffect *this = (IAndroidEffect *) self; - if (SL_OBJECTID_AUDIOPLAYER == IObjectToObjectID(this->mThis)) { - CAudioPlayer *ap = (CAudioPlayer *)this->mThis; - if (NULL != ap->mAudioTrack) { - result = android_genericFx_createEffect(this, effectImplementationId, ap->mSessionId); - } else { - result = SL_RESULT_RESOURCE_ERROR; - } - } else if (SL_OBJECTID_OUTPUTMIX == IObjectToObjectID(this->mThis)) { - result = android_genericFx_createEffect(this, effectImplementationId, - android::AudioSystem::SESSION_OUTPUT_MIX); - } else { - // the interface itself is invalid because it is not attached to an AudioPlayer or - // an OutputMix - result = SL_RESULT_PARAMETER_INVALID; - } - - SL_LEAVE_INTERFACE -} - - -static SLresult IAndroidEffect_ReleaseEffect(SLAndroidEffectItf self, - SLInterfaceID effectImplementationId) { - - SL_ENTER_INTERFACE - - IAndroidEffect *this = (IAndroidEffect *) self; - result = android_genericFx_releaseEffect(this, effectImplementationId); - - SL_LEAVE_INTERFACE -} - - -static SLresult IAndroidEffect_SetEnabled(SLAndroidEffectItf self, - SLInterfaceID effectImplementationId, SLboolean enabled) { - - SL_ENTER_INTERFACE - - IAndroidEffect *this = (IAndroidEffect *) self; - result = android_genericFx_setEnabled(this, effectImplementationId, enabled); - - SL_LEAVE_INTERFACE -} - - -static SLresult IAndroidEffect_IsEnabled(SLAndroidEffectItf self, - SLInterfaceID effectImplementationId, SLboolean * pEnabled) { - - SL_ENTER_INTERFACE - - IAndroidEffect *this = (IAndroidEffect *) self; - result = android_genericFx_isEnabled(this, effectImplementationId, pEnabled); - - SL_LEAVE_INTERFACE -} - - -static SLresult IAndroidEffect_SendCommand(SLAndroidEffectItf self, - SLInterfaceID effectImplementationId, SLuint32 command, SLuint32 commandSize, - void* pCommand, SLuint32 *replySize, void *pReply) { - - SL_ENTER_INTERFACE - - IAndroidEffect *this = (IAndroidEffect *) self; - result = android_genericFx_sendCommand(this, effectImplementationId, command, commandSize, - pCommand, replySize, pReply); - - SL_LEAVE_INTERFACE -} - - -static const struct SLAndroidEffectItf_ IAndroidEffect_Itf = { - IAndroidEffect_CreateEffect, - IAndroidEffect_ReleaseEffect, - IAndroidEffect_SetEnabled, - IAndroidEffect_IsEnabled, - IAndroidEffect_SendCommand -}; - -void IAndroidEffect_init(void *self) -{ - IAndroidEffect *this = (IAndroidEffect *) self; - this->mItf = &IAndroidEffect_Itf; -#ifndef TARGET_SIMULATOR - this->mEffects = new android::KeyedVector<SLuint32, android::AudioEffect* >(); -#endif -} - -void IAndroidEffect_deinit(void *self) -{ - IAndroidEffect *this = (IAndroidEffect *) self; -#ifndef TARGET_SIMULATOR - if (NULL != this->mEffects) { - if (!this->mEffects->isEmpty()) { - for (size_t i = 0 ; i < this->mEffects->size() ; i++) { - delete this->mEffects->valueAt(i); - } - this->mEffects->clear(); - } - delete this->mEffects; - this->mEffects = NULL; - } -#endif -} diff --git a/opensles/libopensles/IAndroidEffect.cpp b/opensles/libopensles/IAndroidEffect.cpp new file mode 100644 index 0000000..b934c15 --- /dev/null +++ b/opensles/libopensles/IAndroidEffect.cpp @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* Android Effect implementation */ + +#include "sles_allinclusive.h" + + +static SLresult IAndroidEffect_CreateEffect(SLAndroidEffectItf self, + SLInterfaceID effectImplementationId) { + + SL_ENTER_INTERFACE + + IAndroidEffect *this = (IAndroidEffect *) self; + if (SL_OBJECTID_AUDIOPLAYER == IObjectToObjectID(this->mThis)) { + CAudioPlayer *ap = (CAudioPlayer *)this->mThis; + if (NULL != ap->mAudioTrack) { + result = android_genericFx_createEffect(this, effectImplementationId, ap->mSessionId); + } else { + result = SL_RESULT_RESOURCE_ERROR; + } + } else if (SL_OBJECTID_OUTPUTMIX == IObjectToObjectID(this->mThis)) { + result = android_genericFx_createEffect(this, effectImplementationId, + android::AudioSystem::SESSION_OUTPUT_MIX); + } else { + // the interface itself is invalid because it is not attached to an AudioPlayer or + // an OutputMix + result = SL_RESULT_PARAMETER_INVALID; + } + + SL_LEAVE_INTERFACE +} + + +static SLresult IAndroidEffect_ReleaseEffect(SLAndroidEffectItf self, + SLInterfaceID effectImplementationId) { + + SL_ENTER_INTERFACE + + IAndroidEffect *this = (IAndroidEffect *) self; + result = android_genericFx_releaseEffect(this, effectImplementationId); + + SL_LEAVE_INTERFACE +} + + +static SLresult IAndroidEffect_SetEnabled(SLAndroidEffectItf self, + SLInterfaceID effectImplementationId, SLboolean enabled) { + + SL_ENTER_INTERFACE + + IAndroidEffect *this = (IAndroidEffect *) self; + result = android_genericFx_setEnabled(this, effectImplementationId, enabled); + + SL_LEAVE_INTERFACE +} + + +static SLresult IAndroidEffect_IsEnabled(SLAndroidEffectItf self, + SLInterfaceID effectImplementationId, SLboolean * pEnabled) { + + SL_ENTER_INTERFACE + + IAndroidEffect *this = (IAndroidEffect *) self; + result = android_genericFx_isEnabled(this, effectImplementationId, pEnabled); + + SL_LEAVE_INTERFACE +} + + +static SLresult IAndroidEffect_SendCommand(SLAndroidEffectItf self, + SLInterfaceID effectImplementationId, SLuint32 command, SLuint32 commandSize, + void* pCommand, SLuint32 *replySize, void *pReply) { + + SL_ENTER_INTERFACE + + IAndroidEffect *this = (IAndroidEffect *) self; + result = android_genericFx_sendCommand(this, effectImplementationId, command, commandSize, + pCommand, replySize, pReply); + + SL_LEAVE_INTERFACE +} + + +static const struct SLAndroidEffectItf_ IAndroidEffect_Itf = { + IAndroidEffect_CreateEffect, + IAndroidEffect_ReleaseEffect, + IAndroidEffect_SetEnabled, + IAndroidEffect_IsEnabled, + IAndroidEffect_SendCommand +}; + +void IAndroidEffect_init(void *self) +{ + IAndroidEffect *this = (IAndroidEffect *) self; + this->mItf = &IAndroidEffect_Itf; +#ifndef TARGET_SIMULATOR + this->mEffects = new android::KeyedVector<SLuint32, android::AudioEffect* >(); +#endif +} + +void IAndroidEffect_deinit(void *self) +{ + IAndroidEffect *this = (IAndroidEffect *) self; +#ifndef TARGET_SIMULATOR + if (NULL != this->mEffects) { + if (!this->mEffects->isEmpty()) { + for (size_t i = 0 ; i < this->mEffects->size() ; i++) { + delete this->mEffects->valueAt(i); + } + this->mEffects->clear(); + } + delete this->mEffects; + this->mEffects = NULL; + } +#endif +}
On Wed, Mar 16, 2011 at 10:46 AM, Sachin Kamat sachin.kamat@linaro.org wrote:
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I39652f14b362c42ebc2ceb37952d8e57cf89692c
opensles/libopensles/Android.mk | 2 +- opensles/libopensles/IAndroidEffect.c | 130 ------------------------------- opensles/libopensles/IAndroidEffect.cpp | 130 +++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 opensles/libopensles/IAndroidEffect.c create mode 100644 opensles/libopensles/IAndroidEffect.cpp
If it's purely file rename, using '-M' flag with git format-patch gives much more manageable patch.
Thanks Jassi..
Resending the patch (created using -M) ********************************
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org Change-Id: I39652f14b362c42ebc2ceb37952d8e57cf89692c --- opensles/libopensles/Android.mk | 2 +- .../{IAndroidEffect.c => IAndroidEffect.cpp} | 0 2 files changed, 1 insertions(+), 1 deletions(-) rename opensles/libopensles/{IAndroidEffect.c => IAndroidEffect.cpp} (100%) diff --git a/opensles/libopensles/Android.mk b/opensles/libopensles/Android.mk index 64e9b6f..f965d3e 100644 --- a/opensles/libopensles/Android.mk +++ b/opensles/libopensles/Android.mk @@ -56,7 +56,7 @@ LOCAL_SRC_FILES:= \ CEngine.c \ COutputMix.c \ IAndroidConfiguration.c \ - IAndroidEffect.c \ + IAndroidEffect.cpp \ IAndroidEffectCapabilities.c \ IAndroidEffectSend.c \ IBassBoost.c \ diff --git a/opensles/libopensles/IAndroidEffect.c b/opensles/libopensles/IAndroidEffect.cpp similarity index 100% rename from opensles/libopensles/IAndroidEffect.c rename to opensles/libopensles/IAndroidEffect.cpp
On 16 March 2011 13:16, Sachin Kamat sachin.kamat@linaro.org wrote:
Signed-off-by: Sachin Kamat sachin.kamat@linaro.org
Change-Id: I39652f14b362c42ebc2ceb37952d8e57cf89692c
opensles/libopensles/Android.mk | 2 +- opensles/libopensles/IAndroidEffect.c | 130 ------------------------------- opensles/libopensles/IAndroidEffect.cpp | 130 +++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 opensles/libopensles/IAndroidEffect.c create mode 100644 opensles/libopensles/IAndroidEffect.cpp
Alternatively, disabling C++ RTTI can avoid linkage error: https://review.source.android.com//#change,20439
Thanks, -jserv
Hi,
I think your patches are good enough (now after the review) to start pushing them to a toolchain_preview branch. That way people can use the toolchain_preview branch when working with the toolchain.
At the same time someone can try to replace some of your patches with solutions that solves the problems instead of hiding them. :) The goal is to get good patches to the linaro_android branch and in the end get them all the way to AOSP if possible.
Regards, Patrik
On 16 March 2011 06:16, Sachin Kamat sachin.kamat@linaro.org wrote:
Hi,
The next set of patches will help in building Android source code out of the box using Linaro GCC 4.5/4.6 toolchains. The patches basically try to circumvent the build problem caused by stricter GCC 4.5/4.6. These patches are based on remotes/m/linaro_android_2.3.2 branch.
Regards, Sachin
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
On 17 March 2011 23:35, Patrik Ryd patrik.ryd@linaro.org wrote:
Hi, I think your patches are good enough (now after the review) to start pushing them to a toolchain_preview branch. That way people can use the toolchain_preview branch when working with the toolchain. At the same time someone can try to replace some of your patches with solutions that solves the problems instead of hiding them. :) The goal is to get good patches to the linaro_android branch and in the end get them all the way to AOSP if possible.
hi Patrik,
So, it implies that we should have an branch in manifests? http://git.linaro.org/gitweb?p=android/platform/manifests.git%3Ba=summary
Also, we would take that branch as the testbed for toolchain/NDK benchmarking.
Sincerely, -jserv
On 18 March 2011 07:06, Jim Huang jim.huang@linaro.org wrote:
On 17 March 2011 23:35, Patrik Ryd patrik.ryd@linaro.org wrote:
Hi, I think your patches are good enough (now after the review) to start
pushing
them to a toolchain_preview branch. That way people can use the toolchain_preview branch when working with the toolchain. At the same time someone can try to replace some of your patches with solutions that solves the problems instead of hiding them. :) The goal is
to
get good patches to the linaro_android branch and in the end get them all the way to AOSP if possible.
hi Patrik,
So, it implies that we should have an branch in manifests? http://git.linaro.org/gitweb?p=android/platform/manifests.git%3Ba=summary
True.
Also, we would take that branch as the testbed for toolchain/NDK benchmarking.
Yes, but the goal is to be able at some point to move over to the official linaro_android... branch.
BR, Patrik
Sincerely, -jserv
On 18 March 2011 08:43, Patrik Ryd patrik.ryd@linaro.org wrote:
On 18 March 2011 07:06, Jim Huang jim.huang@linaro.org wrote:
On 17 March 2011 23:35, Patrik Ryd patrik.ryd@linaro.org wrote:
Hi, I think your patches are good enough (now after the review) to start
pushing
them to a toolchain_preview branch. That way people can use the toolchain_preview branch when working with the toolchain. At the same time someone can try to replace some of your patches with solutions that solves the problems instead of hiding them. :) The goal
is to
get good patches to the linaro_android branch and in the end get them
all
the way to AOSP if possible.
hi Patrik,
So, it implies that we should have an branch in manifests?
http://git.linaro.org/gitweb?p=android/platform/manifests.git%3Ba=summary
True.
The patches are now on git.linaro.org and there is a branch on the manifest for the toolchain work.
The new branch on the manifest is called "dev_toolchain_preview".
Use repo init git://git.linaro.org/android/platform/manifests.git -b dev_toolchain_preview to fetch the code.
/Patrik
Also, we would take that branch as the testbed for toolchain/NDK benchmarking.
Yes, but the goal is to be able at some point to move over to the official linaro_android... branch.
BR, Patrik
Sincerely, -jserv
-
Alexander Sack -
Arnd Bergmann -
Jamie Bennett -
Jassi Brar -
Jim Huang -
john stultz -
Patrik Ryd -
Sachin Kamat