bindings/java/build.sh: revert previous modification.

Author: dot-asm

bindings/java/Android.mk

@@ -28,10 +28,10 @@ $(LOCAL_PATH)/blst/src/server.c $(LOCAL_PATH)/blst/build/assembly.S: $(LOCAL_PAT
 $(LOCAL_PATH)/blst_wrap.cpp: $(LOCAL_PATH)/blst/bindings/blst.swg
 	blst_classes=`dirname $@`/../src/supranational/blst && \
 	mkdir -p $$blst_classes && \
-	swig -c++ -java -package supranational.blst -outdir $$blst_classes -D__BLST_BYTES_T__ -o $@ $<
+	swig -c++ -java -package supranational.blst -outdir $$blst_classes -o $@ $<
 
 LOCAL_CFLAGS := -fno-builtin-memcpy -fvisibility=hidden
-LOCAL_CPPFLAGS := -fexceptions -I$(LOCAL_PATH)/blst/bindings -D__BLST_BYTES_T__
+LOCAL_CPPFLAGS := -fexceptions -I$(LOCAL_PATH)/blst/bindings
 LOCAL_LDFLAGS := -Wl,-Bsymbolic
 
 include $(BUILD_SHARED_LIBRARY)

bindings/java/build.sh

@@ -45,7 +45,7 @@ if [ ! -f blst_wrap.cpp -o "$TOP"/blst.swg -nt blst_wrap.cpp \
                         -o "$TOP"/blst.h   -nt blst_wrap.cpp \
                         -o ! -f $PKG/blst.java ]; then
     (set -x; swig -c++ -java -package $JAVA_PACKAGE -outdir $PKG \
-                  -D__BLST_BYTES_T__ -o blst_wrap.cpp "$TOP"/blst.swg)
+                  -o blst_wrap.cpp "$TOP"/blst.swg)
 fi
 
 if [ ! -f $PKG/blst.class -o $PKG/blst.java -nt $PKG/blst.class ]; then
@@ -77,7 +77,6 @@ if [ ! -f $SO_NAME -o blst_wrap.cpp -nt $SO_NAME \
          awk '{ if($2=="__cplusplus" && $3<"2011") print "-std=c++11"; }'`
     (set -x; ${CXX} ${STD} -shared -o $SO_NAME -fPIC -fvisibility=hidden \
                     -I"$JAVA_HOME"/include -I"$JNI_MD" -I"$TOP" \
-                    -D__BLST_BYTES_T__ \
                     -O -Wall -Wno-unused-function blst_wrap.cpp \
                     $LIBBLST_A ${LDFLAGS})
 fi