jdk/make/lib/Lib-jdk.deploy.osx.gmk
author igerasim
Fri, 25 Dec 2015 16:45:15 +0300
changeset 34832 46acbee17a0c
parent 34523 7ac19a1f8316
child 35276 50b3cdcef339
permissions -rw-r--r--
8145388: URLConnection.guessContentTypeFromStream returns image/jpg for some JPEG images Summary: Since "image/jpg" is not a valid Content Type, the method should return "image/jpeg" when APPn marker segment has 'EE' as a marker type. Reviewed-by: prr, bpb Contributed-by: ramanand.patil@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 27565
diff changeset
     2
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     4
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    10
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    15
# accompanied this code).
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    16
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    20
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    23
# questions.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    24
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    25
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    26
include LibCommon.gmk
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    27
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    28
ifeq ($(OPENJDK_TARGET_OS), macosx)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    29
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    30
  ################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    31
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    32
  LIBOSX_DIRS := $(JDK_TOPDIR)/src/jdk.deploy.osx/macosx/native/libosx
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    33
  LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    34
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    35
      $(LIBJAVA_HEADER_FLAGS) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    36
      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    37
      -I$(SUPPORT_OUTPUTDIR)/headers/jdk.deploy.osx \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    38
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    39
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    40
  $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    41
      LIBRARY := osx, \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    42
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    43
      SRC := $(LIBOSX_DIRS), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
      OPTIMIZATION := LOW, \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    45
      CFLAGS := $(CFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    46
          $(LIBOSX_CFLAGS), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 27565
diff changeset
    47
      DISABLED_WARNINGS_clang := deprecated-declarations, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    48
      LDFLAGS := $(LDFLAGS_JDKLIB) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    49
          -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    50
          $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 32229
diff changeset
    51
      LIBS := \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    52
          -losxapp \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    53
          -framework Cocoa \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    54
          -framework ApplicationServices \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    55
          -framework JavaNativeFoundation \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    56
          -framework JavaRuntimeSupport \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    57
          -framework SystemConfiguration \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 32229
diff changeset
    58
          $(JDKLIB_LIBS), \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    59
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosx, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    60
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    61
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    62
  TARGETS += $(BUILD_LIBOSX)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    63
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    64
  $(BUILD_LIBOSX): $(call FindLib, java.desktop, osxapp)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    65
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    66
  $(BUILD_LIBOSX): $(call FindLib, java.base, java)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    67
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    68
  ################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    69
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    70
endif