Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Picovr suffix #3380

Merged
merged 1 commit into from
May 20, 2020
Merged

Picovr suffix #3380

merged 1 commit into from
May 20, 2020

Conversation

keianhzo
Copy link
Contributor

Pico now has a ROM baked version of FxR. We need to provide a suffix so QA can test staging build without colliding with the production appId.

@keianhzo keianhzo self-assigned this May 15, 2020
@keianhzo keianhzo requested a review from bluemarvin May 15, 2020 12:25
@bluemarvin
Copy link
Contributor

@keianhzo Maybe we should unify the suffix between WaveVR and pico? It would make scripting easier. Maybe .internal?

@bluemarvin bluemarvin added this to the #11 polish milestone May 15, 2020
@keianhzo
Copy link
Contributor Author

@bluemarvin Updated.

Copy link
Contributor

@bluemarvin bluemarvin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The release build fails. Try ./gradlew assemblePicovrstoreArm64Release
Result:

> Task :app:processPicovrStoreArm64ReleaseAnnotationsWithJavac FAILED
ANTLR Tool version 4.5.3 used for code generation does not match the current runtime version 4.7.1ANTLR Runtime version 4.5.3 used for parser compilation does not match the current runtime version 4.7.1ANTLR Tool version 4.5.3 used for code generation does not match the current runtime version 4.7.1ANTLR Runtime version 4.5.3 used for parser compilation does not match the current runtime version 4.7.1warning: Current JDK version 1.8.0_201-b09 has a bug (https://bugs.openjdk.java.net/browse/JDK-8007720) that prevents Room from being incremental. Consider using JDK 11+ or the embedded JDK shipped with Android Studio 3.5+.
/home/randall/src/FirefoxReality/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java:102: error: cannot find symbol
public class VRBrowserActivity extends PlatformActivity implements WidgetManagerDelegate, ComponentCallbacks2, LifecycleOwner, ViewModelStoreOwner {
                                       ^
  symbol: class PlatformActivity
/home/randall/src/FirefoxReality/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java:15: error: cannot find symbol
import org.mozilla.vrbrowser.PlatformActivity;
                            ^
  symbol:   class PlatformActivity
  location: package org.mozilla.vrbrowser
/home/randall/src/FirefoxReality/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WebXRInterstitialController.java:11: error: cannot find symbol
import org.mozilla.vrbrowser.databinding.WebxrInterstitialControllerBinding;
                                        ^
  symbol:   class WebxrInterstitialControllerBinding
  location: package org.mozilla.vrbrowser.databinding
/home/randall/src/FirefoxReality/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WebXRInterstitialController.java:15: error: cannot find symbol
    private WebxrInterstitialControllerBinding mBinding;
            ^
  symbol:   class WebxrInterstitialControllerBinding
  location: class WebXRInterstitialController
4 errors
1 warning

FAILURE: Build failed with an exception.

@bluemarvin
Copy link
Contributor

Also the build targets need to be updated for taskcluster:

diff --git a/tools/taskcluster/build_targets.py b/tools/taskcluster/build_targets.py
index d14d65dc..cdc1b4f4 100644
--- a/tools/taskcluster/build_targets.py
+++ b/tools/taskcluster/build_targets.py
@@ -39,6 +39,7 @@ platforms = {
    'wavevr': ['arm64'],
    'wavevrStore': ['arm64'],
    'picovr': ['arm64'],
+   'picovrStore': ['arm64'],
    'noapi': ['arm64', 'x86_64'],
 }

@bluemarvin
Copy link
Contributor

@daoshengmu Should this:

Distribution.INSTANCE.getChannelName().set(DeviceType.isOculusBuild() ? "oculusvr" : BuildConfig.FLAVOR_platform);

be update to:

private static void setStartupMetrics() {
    String type = BuildConfig.FLAVOR_platform;
    if (DeviceType.isOculusBuild()) {
        type = "oculusvr";
    } else if (DeviceType.isPicoVR()) {
        type = "picovr";
    }
    Distribution.INSTANCE.getChannelName().set(type);
}

@daoshengmu
Copy link
Contributor

daoshengmu commented May 18, 2020

@daoshengmu Should this:

Distribution.INSTANCE.getChannelName().set(DeviceType.isOculusBuild() ? "oculusvr" : BuildConfig.FLAVOR_platform);

be update to:

private static void setStartupMetrics() {
    String type = BuildConfig.FLAVOR_platform;
    if (DeviceType.isOculusBuild()) {
        type = "oculusvr";
    } else if (DeviceType.isPicoVR()) {
        type = "picovr";
    }
    Distribution.INSTANCE.getChannelName().set(type);
}

Yes. We can do this to keep our telemetry be matched. We might be able to consider to make DeviceType.isWaveBuild()) and type = 'wavevrStore' either. In that way, we can collect our data from different kinds of users. Then, in our queries, we can use channel==release to filter developers.

@daoshengmu
Copy link
Contributor

@keianhzo keianhzo force-pushed the v11/picovr_suffix branch 2 times, most recently from 8c000bc to daf2aa2 Compare May 20, 2020 20:11
@keianhzo
Copy link
Contributor Author

@daoshengmu @bluemarvin This should be ready.

Copy link
Contributor

@daoshengmu daoshengmu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@bluemarvin bluemarvin merged commit a989e89 into master May 20, 2020
@bluemarvin bluemarvin deleted the v11/picovr_suffix branch May 20, 2020 20:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants