Fix jumbo compilation for Android in //base

The define of "Long" to "long" ended up changing some "Long" strings in jni code to "long" which broke compilation. Bug: 775547 Change-Id: If9dab9f193b0cad5067903f46ade98155254c7de Reviewed-on: https://chromium-review.googlesource.com/758366 Reviewed-by: danakj <danakj@chromium.org> Commit-Queue: Daniel Bratell <bratell@opera.com> Cr-Commit-Position: refs/heads/master@{#514883}
qweri0p · Nov 8, 2017 · efa1e60 · efa1e60
1 parent 6b4d0b1
commit efa1e60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/base/third_party/dmg_fp/README.chromium b/base/third_party/dmg_fp/README.chromium
@@ -19,3 +19,4 @@ List of changes made to original code:
   - fixed parsing of long exponents, see exp_length.patch and crbug.com/542881
   - made hexdig array const
   - removed deprecated `register` keyword
+  - #undef Long so that it won't change Long in other files in jumbo builds
diff --git a/base/third_party/dmg_fp/dtoa_wrapper.cc b/base/third_party/dmg_fp/dtoa_wrapper.cc
@@ -44,3 +44,5 @@ inline static void FREE_DTOA_LOCK(size_t n) {
 }
 
 #include "base/third_party/dmg_fp/dtoa.cc"
+
+#undef Long  // To avoid breaking jni code in jumbo builds
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,5 @@ inline static void FREE_DTOA_LOCK(size_t n) {
		}

		#include "base/third_party/dmg_fp/dtoa.cc"

		#undef Long // To avoid breaking jni code in jumbo builds