Merge "doc: Update doc not to download kernel image" into main
diff --git a/docs/custom_vm.md b/docs/custom_vm.md
index ef9167f..945798f 100644
--- a/docs/custom_vm.md
+++ b/docs/custom_vm.md
@@ -77,8 +77,8 @@
First, check out source code from the ChromiumOS and Chromium projects.
+* Checking out Chromium: https://www.chromium.org/developers/how-tos/get-the-code/
* Checking out ChromiumOS: https://www.chromium.org/chromium-os/developer-library/guides/development/developer-guide/
-* Checking out Chromium: https://g3doc.corp.google.com/chrome/chromeos/system_services_team/dev_instructions/g3doc/setup_checkout.md?cl=head
Important: When you are at the step “Set up gclient args” in the Chromium checkout instruction, configure .gclient as follows.
@@ -90,9 +90,7 @@
"url": "https://chromium.googlesource.com/chromium/src.git",
"managed": False,
"custom_deps": {},
- "custom_vars": {
- "checkout_src_internal": True,
- },
+ "custom_vars": {},
},
]
target_os = ['chromeos']
diff --git a/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java b/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
index d4365a7..8a13030 100644
--- a/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
+++ b/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
@@ -43,7 +43,7 @@
public class FerrochromeActivity extends Activity {
ExecutorService executorService = Executors.newSingleThreadExecutor();
private static final String TAG = "FerrochromeActivity";
- private static final String FERROCHROME_VERSION = "R127-15916.0.0";
+ private static final String FERROCHROME_VERSION = "R128-15926.0.0";
private static final String EXTERNAL_STORAGE_DIR =
Environment.getExternalStorageDirectory().getPath() + File.separator;
private static final Path IMAGE_PATH =
diff --git a/vmlauncher_app/AndroidManifest.xml b/vmlauncher_app/AndroidManifest.xml
index ecfef86..4f95086 100644
--- a/vmlauncher_app/AndroidManifest.xml
+++ b/vmlauncher_app/AndroidManifest.xml
@@ -15,7 +15,7 @@
android:exported="true">
</activity>
<activity-alias android:name=".MainActivityAlias"
- android:targetActivity=".MainActivity"
+ android:targetActivity="com.android.virtualization.vmlauncher.MainActivity"
android:exported="true"
android:enabled="false">
<intent-filter>