Advertisement
micromike

android2.3.3 slackware 14 patch

Jan 20th, 2013
179
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.36 KB | None | 0 0
  1.  
  2. project external/srec/
  3. diff --git a/external/srec/tools/grxmlcompile/Android.mk b/external/srec/tools/grxmlcompile/Android.mk
  4. index 4661b43..f90b601 100644
  5. --- a/external/srec/tools/grxmlcompile/Android.mk
  6. +++ b/external/srec/tools/grxmlcompile/Android.mk
  7. @@ -42,6 +42,7 @@ LOCAL_CFLAGS += \
  8. $(ASR_GLOBAL_DEFINES) \
  9. $(ASR_GLOBAL_CPPFLAGS) \
  10. -fexceptions \
  11. + -fpermissive \
  12.  
  13. LOCAL_SHARED_LIBRARIES := \
  14. libESR_Shared \
  15. diff --git a/external/srec/tools/make_cfst/Android.mk b/external/srec/tools/make_cfst/Android.mk
  16. index 9e4180f..1e236d2 100644
  17. --- a/external/srec/tools/make_cfst/Android.mk
  18. +++ b/external/srec/tools/make_cfst/Android.mk
  19. @@ -23,6 +23,7 @@ LOCAL_C_INCLUDES := \
  20. LOCAL_CFLAGS += \
  21. $(ASR_GLOBAL_DEFINES) \
  22. $(ASR_GLOBAL_CPPFLAGS) \
  23. + -fpermissive \
  24.  
  25. LOCAL_SHARED_LIBRARIES := \
  26. libESR_Shared \
  27. diff --git a/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk b/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
  28. index 0593078..29f5825 100644
  29. --- a/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
  30. +++ b/external/srec/tools/thirdparty/OpenFst/fst/lib/Android.mk
  31. @@ -15,6 +15,7 @@ LOCAL_C_INCLUDES := \
  32.  
  33. LOCAL_CFLAGS += \
  34. -DFST_DL \
  35. + -fpermissive \
  36.  
  37. LOCAL_SHARED_LIBRARIES := \
  38.  
  39.  
  40. project external/v8/
  41. diff --git a/external/v8/Android.mksnapshot.mk b/external/v8/Android.mksnapshot.mk
  42. index db9678e..f85068d 100644
  43. --- a/external/v8/Android.mksnapshot.mk
  44. +++ b/external/v8/Android.mksnapshot.mk
  45. @@ -57,7 +57,8 @@ LOCAL_CFLAGS := \
  46. -ansi \
  47. -fno-rtti \
  48. -DENABLE_DEBUGGER_SUPPORT \
  49. - -DV8_NATIVE_REGEXP
  50. + -DV8_NATIVE_REGEXP \
  51. + -fpermissive \
  52.  
  53. ifeq ($(TARGET_ARCH),arm)
  54. LOCAL_CFLAGS += -DV8_TARGET_ARCH_ARM
  55.  
  56. project external/webkit/
  57. diff --git a/external/webkit/WebCore/dom/make_names.pl b/external/webkit/WebCore/dom/make_names.pl
  58. index 083e309..2349bd8 100755
  59. --- a/external/webkit/WebCore/dom/make_names.pl
  60. +++ b/external/webkit/WebCore/dom/make_names.pl
  61. @@ -35,7 +35,7 @@ use Getopt::Long;
  62. use File::Path;
  63. use IO::File;
  64. use InFilesParser;
  65. -use Switch;
  66. +#use Switch;
  67.  
  68. my $printFactory = 0;
  69. my $printWrapperFactory = 0;
  70. @@ -47,7 +47,7 @@ my %tags = ();
  71. my %attrs = ();
  72. my %parameters = ();
  73. my $extraDefines = 0;
  74. -my $preprocessor = "/usr/bin/gcc -E -P -x c++";
  75. +my $preprocessor = "/usr/bin/gcc -E -x c++";
  76.  
  77. GetOptions(
  78. 'tags=s' => \$tagsFile,
  79. @@ -198,18 +198,24 @@ sub readNames
  80. my $attrsCount = keys %attrs;
  81.  
  82. my $InParser = InFilesParser->new();
  83. -
  84. - switch ($type) {
  85. - case "tags" {
  86. - $InParser->parse($names, \&parametersHandler, \&tagsHandler);
  87. - }
  88. - case "attrs" {
  89. - $InParser->parse($names, \&parametersHandler, \&attrsHandler);
  90. - }
  91. - else {
  92. - die "Do not know how to parse $type";
  93. - }
  94. + if ($type eq "tags") {
  95. + $InParser->parse($names, \&parametersHandler, \&tagsHandler);
  96. + } elsif ($type eq "attrs") {
  97. + $InParser->parse($names, \&parametersHandler, \&attrsHandler);
  98. + } else {
  99. + die "Do not know how to parse $type";
  100. }
  101. + #switch ($type) {
  102. + # case "tags" {
  103. + # $InParser->parse($names, \&parametersHandler, \&tagsHandler);
  104. + # }
  105. + # case "attrs" {
  106. + # $InParser->parse($names, \&parametersHandler, \&attrsHandler);
  107. + # }
  108. + # else {
  109. + # die "Do not know how to parse $type";
  110. + # }
  111. + #}
  112.  
  113. close($names);
  114.  
  115.  
  116. project frameworks/base/
  117. diff --git a/frameworks/base/libs/utils/Android.mk b/frameworks/base/libs/utils/Android.mk
  118. index eb75ed8..c333143 100644
  119. --- a/frameworks/base/libs/utils/Android.mk
  120. +++ b/frameworks/base/libs/utils/Android.mk
  121. @@ -57,7 +57,7 @@ LOCAL_SRC_FILES:= $(commonSources)
  122.  
  123. LOCAL_MODULE:= libutils
  124.  
  125. -LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
  126. +LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -fpermissive
  127. LOCAL_C_INCLUDES += external/zlib
  128.  
  129. ifeq ($(HOST_OS),windows)
  130. diff --git a/frameworks/base/tools/aapt/Android.mk b/frameworks/base/tools/aapt/Android.mk
  131. index 094b7db..d885883 100644
  132. --- a/frameworks/base/tools/aapt/Android.mk
  133. +++ b/frameworks/base/tools/aapt/Android.mk
  134. @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := \
  135. ZipFile.cpp
  136.  
  137.  
  138. -LOCAL_CFLAGS += -Wno-format-y2k
  139. +LOCAL_CFLAGS += -Wno-format-y2k -fpermissive
  140.  
  141. LOCAL_C_INCLUDES += external/expat/lib
  142. LOCAL_C_INCLUDES += external/libpng
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement