Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- project external/srec/
- diff --git a/external/srec/tools/grxmlcompile/Android.mk b/external/srec/tools/grxmlcompile/Android.mk
- index 4661b43..f90b601 100644
- --- a/external/srec/tools/grxmlcompile/Android.mk
- +++ b/external/srec/tools/grxmlcompile/Android.mk
- @@ -42,6 +42,7 @@ LOCAL_CFLAGS += \
- $(ASR_GLOBAL_DEFINES) \
- $(ASR_GLOBAL_CPPFLAGS) \
- -fexceptions \
- + -fpermissive \
- LOCAL_SHARED_LIBRARIES := \
- libESR_Shared \
- diff --git a/external/srec/tools/make_cfst/Android.mk b/external/srec/tools/make_cfst/Android.mk
- index 9e4180f..1e236d2 100644
- --- a/external/srec/tools/make_cfst/Android.mk
- +++ b/external/srec/tools/make_cfst/Android.mk
- @@ -23,6 +23,7 @@ LOCAL_C_INCLUDES := \
- LOCAL_CFLAGS += \
- $(ASR_GLOBAL_DEFINES) \
- $(ASR_GLOBAL_CPPFLAGS) \
- + -fpermissive \
- LOCAL_SHARED_LIBRARIES := \
- libESR_Shared \
- diff --git a/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk b/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
- index 0593078..29f5825 100644
- --- a/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
- +++ b/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
- @@ -15,6 +15,7 @@ LOCAL_C_INCLUDES := \
- LOCAL_CFLAGS += \
- -DFST_DL \
- + -fpermissive \
- LOCAL_SHARED_LIBRARIES := \
- project external/v8/
- diff --git a/external/v8/Android.mksnapshot.mk b/external/v8/Android.mksnapshot.mk
- index db9678e..f85068d 100644
- --- a/external/v8/Android.mksnapshot.mk
- +++ b/external/v8/Android.mksnapshot.mk
- @@ -57,7 +57,8 @@ LOCAL_CFLAGS := \
- -ansi \
- -fno-rtti \
- -DENABLE_DEBUGGER_SUPPORT \
- - -DV8_NATIVE_REGEXP
- + -DV8_NATIVE_REGEXP \
- + -fpermissive \
- ifeq ($(TARGET_ARCH),arm)
- LOCAL_CFLAGS += -DV8_TARGET_ARCH_ARM
- project external/webkit/
- diff --git a/external/webkit/WebCore/dom/make_names.pl b/external/webkit/WebCore/dom/make_names.pl
- index 083e309..2349bd8 100755
- --- a/external/webkit/WebCore/dom/make_names.pl
- +++ b/external/webkit/WebCore/dom/make_names.pl
- @@ -35,7 +35,7 @@ use Getopt::Long;
- use File::Path;
- use IO::File;
- use InFilesParser;
- -use Switch;
- +#use Switch;
- my $printFactory = 0;
- my $printWrapperFactory = 0;
- @@ -47,7 +47,7 @@ my %tags = ();
- my %attrs = ();
- my %parameters = ();
- my $extraDefines = 0;
- -my $preprocessor = "/usr/bin/gcc -E -P -x c++";
- +my $preprocessor = "/usr/bin/gcc -E -x c++";
- GetOptions(
- 'tags=s' => \$tagsFile,
- @@ -198,18 +198,24 @@ sub readNames
- my $attrsCount = keys %attrs;
- my $InParser = InFilesParser->new();
- -
- - switch ($type) {
- - case "tags" {
- - $InParser->parse($names, \¶metersHandler, \&tagsHandler);
- - }
- - case "attrs" {
- - $InParser->parse($names, \¶metersHandler, \&attrsHandler);
- - }
- - else {
- - die "Do not know how to parse $type";
- - }
- + if ($type eq "tags") {
- + $InParser->parse($names, \¶metersHandler, \&tagsHandler);
- + } elsif ($type eq "attrs") {
- + $InParser->parse($names, \¶metersHandler, \&attrsHandler);
- + } else {
- + die "Do not know how to parse $type";
- }
- + #switch ($type) {
- + # case "tags" {
- + # $InParser->parse($names, \¶metersHandler, \&tagsHandler);
- + # }
- + # case "attrs" {
- + # $InParser->parse($names, \¶metersHandler, \&attrsHandler);
- + # }
- + # else {
- + # die "Do not know how to parse $type";
- + # }
- + #}
- close($names);
- project frameworks/base/
- diff --git a/frameworks/base/libs/utils/Android.mk b/frameworks/base/libs/utils/Android.mk
- index eb75ed8..c333143 100644
- --- a/frameworks/base/libs/utils/Android.mk
- +++ b/frameworks/base/libs/utils/Android.mk
- @@ -57,7 +57,7 @@ LOCAL_SRC_FILES:= $(commonSources)
- LOCAL_MODULE:= libutils
- -LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
- +LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -fpermissive
- LOCAL_C_INCLUDES += external/zlib
- ifeq ($(HOST_OS),windows)
- diff --git a/frameworks/base/tools/aapt/Android.mk b/frameworks/base/tools/aapt/Android.mk
- index 094b7db..d885883 100644
- --- a/frameworks/base/tools/aapt/Android.mk
- +++ b/frameworks/base/tools/aapt/Android.mk
- @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := \
- ZipFile.cpp
- -LOCAL_CFLAGS += -Wno-format-y2k
- +LOCAL_CFLAGS += -Wno-format-y2k -fpermissive
- LOCAL_C_INCLUDES += external/expat/lib
- LOCAL_C_INCLUDES += external/libpng
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement