8255530: Additional cleanup after JDK-8235710 (elliptic curve removal)
Reviewed-by: erikj
This commit is contained in:
parent
790d6e2d25
commit
edd19888df
@ -759,7 +759,6 @@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
|
|||||||
|
|
||||||
# Build setup
|
# Build setup
|
||||||
ENABLE_AOT:=@ENABLE_AOT@
|
ENABLE_AOT:=@ENABLE_AOT@
|
||||||
ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@
|
|
||||||
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
|
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
|
||||||
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
|
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
|
||||||
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
|
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
|
||||||
|
@ -1,49 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
#
|
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
include LibCommon.gmk
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
ifeq ($(ENABLE_INTREE_EC), true)
|
|
||||||
$(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
|
|
||||||
NAME := sunec, \
|
|
||||||
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
|
|
||||||
OPTIMIZATION := LOW, \
|
|
||||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
|
||||||
-DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
|
|
||||||
CXXFLAGS := $(CXXFLAGS_JDKLIB), \
|
|
||||||
DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough unused-value, \
|
|
||||||
DISABLED_WARNINGS_clang := sign-compare, \
|
|
||||||
DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
|
|
||||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
|
||||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
|
||||||
LIBS := $(LIBCXX), \
|
|
||||||
))
|
|
||||||
|
|
||||||
TARGETS += $(BUILD_LIBSUNEC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
################################################################################
|
|
Loading…
Reference in New Issue
Block a user