8079771: Fix SoundLibraries.gmk mismerge after JDK-8072665
Reviewed-by: dholmes, erikj
This commit is contained in:
parent
bd394344b3
commit
4f0d955e38
@ -111,10 +111,6 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
|
|||||||
LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
|
LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
|
||||||
endif # OPENJDK_TARGET_OS solaris
|
endif # OPENJDK_TARGET_OS solaris
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
|
||||||
LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
|
|
||||||
endif
|
|
||||||
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
|
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
|
||||||
|
|
||||||
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
|
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
#define X_BSD 4
|
#define X_BSD 4
|
||||||
#define X_MACOSX 5
|
#define X_MACOSX 5
|
||||||
|
|
||||||
#define X_AARCH64 9
|
|
||||||
// **********************************
|
// **********************************
|
||||||
// Make sure you set X_PLATFORM defines correctly.
|
// Make sure you set X_PLATFORM defines correctly.
|
||||||
// Everything depends upon this flag being setup correctly.
|
// Everything depends upon this flag being setup correctly.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user