archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8246094: [macos] Sound Recording and playback is not working

Browse source 
Reviewed-by: prr, serb
This commit is contained in:
Erik Joelsson 2020-07-24 10:52:02 -07:00
parent 922ba8da30
commit fcd5d414d6
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
make/common/modules/LauncherCommon.gmk
View file

@ -103,12 +103,22 @@ define SetupBuildLauncherBody
ifeq ($(call isTargetOs, macosx), true) ifeq ($(call isTargetOs, macosx), true)
ifeq ($$($1_MACOSX_PRIVILEGED), true) ifeq ($$($1_MACOSX_PRIVILEGED), true)
$1_PLIST_FILE := Info-privileged.plist $1_PLIST_SRC_FILE := Info-privileged.plist
else else
$1_PLIST_FILE := Info-cmdline.plist $1_PLIST_SRC_FILE := Info-cmdline.plist
endif endif
$1_LDFLAGS += -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) $1_PLIST_FILE := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$1/Info.plist
$$(eval $$(call SetupTextFileProcessing, BUILD_PLIST_$1, \
SOURCE_FILES := $$(TOPDIR)/src/java.base/macosx/native/launcher/$$($1_PLIST_SRC_FILE), \
OUTPUT_FILE := $$($1_PLIST_FILE), \
REPLACEMENTS := \
@@ID@@ => $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT).$1 ; \
@@VERSION@@ => $(VERSION_NUMBER) ; \
))
$1_LDFLAGS += -sectcreate __TEXT __info_plist $$($1_PLIST_FILE)
ifeq ($(STATIC_BUILD), true) ifeq ($(STATIC_BUILD), true)
$1_LDFLAGS += -exported_symbols_list \ $1_LDFLAGS += -exported_symbols_list \
@ -168,6 +178,8 @@ define SetupBuildLauncherBody
$1 += $$(BUILD_LAUNCHER_$1) $1 += $$(BUILD_LAUNCHER_$1)
TARGETS += $$($1) TARGETS += $$($1)
$$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
ifeq ($(call isTargetOs, aix), true) ifeq ($(call isTargetOs, aix), true)
$$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static)
endif endif

2
make/data/bundle/JDK-Info.plist
View file

@ -22,6 +22,8 @@
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>@@VERSION@@</string> <string>@@VERSION@@</string>
<key>NSMicrophoneUsageDescription</key>
<string>The application is requesting access to the microphone.</string>
<key>JavaVM</key> <key>JavaVM</key>
<dict> <dict>
<key>JVMCapabilities</key> <key>JVMCapabilities</key>

2
make/data/bundle/JRE-Info.plist
View file

@ -22,6 +22,8 @@
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>@@VERSION@@</string> <string>@@VERSION@@</string>
<key>NSMicrophoneUsageDescription</key>
<string>The application is requesting access to the microphone.</string>
<key>JavaVM</key> <key>JavaVM</key>
<dict> <dict>
<key>JVMMinimumFrameworkVersion</key> <key>JVMMinimumFrameworkVersion</key>

6
src/java.base/macosx/native/launcher/Info-cmdline.plist
View file

@ -3,12 +3,14 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>net.java.openjdk.cmd</string> <string>@@ID@@</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>@@VERSION@@</string>
<key>NSMicrophoneUsageDescription</key>
<string>The application is requesting access to the microphone.</string>
</dict> </dict>
</plist> </plist>

4
src/java.base/macosx/native/launcher/Info-privileged.plist
View file

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>net.java.openjdk.cmd</string> <string>@@ID@@</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
@ -11,7 +11,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>@@VERSION@@</string>
<key>SecTaskAccess</key> <key>SecTaskAccess</key>
<string>allowed</string> <string>allowed</string>
</dict> </dict>