Skip to content

Commit

Permalink
Cherry pick PR #883: [XB1] Add stub keyboxes for external xb1 build (…
Browse files Browse the repository at this point in the history
…#894)

Add stub keyboxes to allow the external xb1 build to succeed.

Update appx_product_settings.py to point to youtube on startup and have
a better example for the publisher field.

b/290262559

Change-Id: I3439b1e324ef17966c01070449926051477d5ca0
(cherry picked from commit c6ee56e)

Co-authored-by: Tyler Holcombe <[email protected]>
  • Loading branch information
cobalt-github-releaser-bot and TyHolc authored Jul 12, 2023
1 parent b78675c commit 9ce6c8b
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 5 deletions.
2 changes: 1 addition & 1 deletion starboard/shared/uwp/system_get_property.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
#include "starboard/common/log.h"
#include "starboard/common/string.h"
#include "starboard/configuration_constants.h"
#include "starboard/keyboxes/xbox/system_properties.h"
#include "starboard/memory.h"
#include "starboard/shared/uwp/application_uwp.h"
#include "starboard/shared/uwp/keys.h"
#include "starboard/shared/win32/wchar_utils.h"
#include "starboard/system.h"
#include "starboard/xb1/shared/internal_shims.h"
#include "starboard/xb1/system_properties.h"

using starboard::shared::win32::platformStringToString;
using Windows::Security::ExchangeActiveSyncProvisioning::
Expand Down
5 changes: 3 additions & 2 deletions starboard/xb1/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ config("starboard_platform_config") {

static_library("starboard_platform") {
sources = [
"//starboard/keyboxes/xbox/system_properties.cc",
"//starboard/shared/egl/system_egl.cc",
"//starboard/shared/gles/system_gles2.cc",
"//starboard/shared/opus/opus_audio_decoder.cc",
Expand Down Expand Up @@ -207,7 +206,6 @@ static_library("starboard_platform") {
public_deps = [ "//starboard/win/shared:starboard_platform" ]

deps = [
"//starboard/shared/widevine:oemcrypto",
"//third_party/angle:translator",
"//third_party/opus",
]
Expand All @@ -224,6 +222,7 @@ static_library("starboard_platform") {
"//internal/starboard/xb1/system_sign_with_certification_secret_key.cc",
"//internal/starboard/xb1/vpx_video_decoder.cc",
"//internal/starboard/xb1/vpx_video_decoder.h",
"//starboard/keyboxes/xbox/system_properties.cc",
"//starboard/shared/widevine/drm_system_widevine.cc",
"//starboard/shared/widevine/drm_system_widevine.h",
"//starboard/shared/widevine/widevine_storage.cc",
Expand All @@ -232,6 +231,7 @@ static_library("starboard_platform") {
"//starboard/shared/widevine/widevine_timer.h",
]
deps += [
"//starboard/shared/widevine:oemcrypto",
"//third_party/internal/ce_cdm/cdm:widevine_cdm_core",
"//third_party/internal/ce_cdm/cdm:widevine_ce_cdm_static",
"//third_party/internal/libav1_xb1",
Expand All @@ -243,6 +243,7 @@ static_library("starboard_platform") {
"//starboard/shared/stub/media_is_supported.cc",
"//starboard/shared/stub/system_sign_with_certification_secret_key.cc",
"//starboard/shared/uwp/keys.cc",
"//starboard/xb1/public_system_properties.cc",
"//starboard/xb1/shared/internal_stubs.cc",
]
}
Expand Down
4 changes: 2 additions & 2 deletions starboard/xb1/appx_product_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'IDENTITY_NAME': 'Cobalt',
# Value for the Publisher attribute of Identity:
# https://learn.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-identity#attributes
'PUBLISHER': 'CN=...',
'PUBLISHER': 'CN=CommonName',
# Value for the DisplayName element:
# https://learn.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-displayname
'DISPLAY_NAME': 'Cobalt',
Expand All @@ -31,7 +31,7 @@
'PUBLISHER_DISPLAY_NAME': 'My Company',
# Value for the EntryPoint attribute of Application:
# https://learn.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-application#attributes
'ENTRYPOINT': 'https://my.website.com',
'ENTRYPOINT': 'https://youtube.com/tv',
# Value for the DisplayName attribute of VisualElements:
# https://learn.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-uap-visualelements#attributes
'APPLICATION_DISPLAY_NAME': 'CobaltApp',
Expand Down
18 changes: 18 additions & 0 deletions starboard/xb1/public_system_properties.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2023 The Cobalt Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "starboard/xb1/system_properties.h"

const char kCertificationScope[] = "";
const char kBase64EncodedCertificationSecret[] = "";
23 changes: 23 additions & 0 deletions starboard/xb1/system_properties.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2023 The Cobalt Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef STARBOARD_XB1_SYSTEM_PROPERTIES_H_
#define STARBOARD_XB1_SYSTEM_PROPERTIES_H_

#include "starboard/configuration.h"

extern const char kCertificationScope[];
extern const char kBase64EncodedCertificationSecret[];

#endif // STARBOARD_XB1_SYSTEM_PROPERTIES_H_

0 comments on commit 9ce6c8b

Please sign in to comment.