diff --git a/tools/android/install_base.sh b/tools/android/install_base.sh index 5061475..eaaa5cf 100755 --- a/tools/android/install_base.sh +++ b/tools/android/install_base.sh @@ -99,9 +99,6 @@ install_android_sdk_manager() { chmod +x -R "${ANDROID_HOME}/cmdline-tools/latest/bin" yes | (call_android_sdkmanager --licenses || true) - - echo "Creating the link to skins directory..." - readlink "${ANDROID_HOME}/skins" > /dev/null 2>&1 || ln -sf "../skins" "${ANDROID_HOME}/skins" } find_java_home() { @@ -146,15 +143,15 @@ create_android_vds() { local vd_name vd_name="devlib-p6-12" echo "Creating virtual device \"${vd_name}\" (Pixel 6 - Android 12)..." - echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-31;google_apis;${android_sdk_host_arch}" --skin pixel_6 -b "${android_sdk_host_arch}" -f + echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-31;google_apis;${android_sdk_host_arch}" -b "${android_sdk_host_arch}" -f vd_name="devlib-p6-14" echo "Creating virtual device \"${vd_name}\" (Pixel 6 - Android 14)..." - echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-34;google_apis;${android_sdk_host_arch}" --skin pixel_6 -b "${android_sdk_host_arch}" -f + echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-34;google_apis;${android_sdk_host_arch}" -b "${android_sdk_host_arch}" -f vd_name="devlib-chromeos" echo "Creating virtual device \"${vd_name}\" (ChromeOS - Android 13, Pixel tablet)..." - echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-33;android-desktop;${android_sdk_host_arch}" --skin pixel_tablet -b "${android_sdk_host_arch}" -f + echo no | call_android_avdmanager -s create avd -n "${vd_name}" -k "system-images;android-33;android-desktop;${android_sdk_host_arch}" -b "${android_sdk_host_arch}" -f } install_apt() { diff --git a/tools/android/skins/pixel_6/back.webp b/tools/android/skins/pixel_6/back.webp deleted file mode 100644 index a412568..0000000 Binary files a/tools/android/skins/pixel_6/back.webp and /dev/null differ diff --git a/tools/android/skins/pixel_6/layout b/tools/android/skins/pixel_6/layout deleted file mode 100644 index ae638d3..0000000 --- a/tools/android/skins/pixel_6/layout +++ /dev/null @@ -1,36 +0,0 @@ -parts { - device { - display { - width 1080 - height 2400 - x 0 - y 0 - } - } - portrait { - background { - image back.webp - } - foreground { - mask mask.webp - cutout hole - } - } -} -layouts { - portrait { - width 1209 - height 2553 - event EV_SW:0:1 - part1 { - name portrait - x 0 - y 0 - } - part2 { - name device - x 60 - y 69 - } - } -} diff --git a/tools/android/skins/pixel_6/mask.webp b/tools/android/skins/pixel_6/mask.webp deleted file mode 100644 index c658b19..0000000 Binary files a/tools/android/skins/pixel_6/mask.webp and /dev/null differ diff --git a/tools/android/skins/pixel_tablet/back.webp b/tools/android/skins/pixel_tablet/back.webp deleted file mode 100644 index 63cd8c0..0000000 Binary files a/tools/android/skins/pixel_tablet/back.webp and /dev/null differ diff --git a/tools/android/skins/pixel_tablet/layout b/tools/android/skins/pixel_tablet/layout deleted file mode 100644 index 09d76f9..0000000 --- a/tools/android/skins/pixel_tablet/layout +++ /dev/null @@ -1,35 +0,0 @@ -parts { - device { - display { - width 2560 - height 1600 - x 0 - y 0 - } - } - portrait { - background { - image back.webp - } - foreground { - mask mask.webp - } - } -} -layouts { - landscape { - width 2798 - height 1837 - event EV_SW:0:1 - part1 { - name portrait - x 0 - y 0 - } - part2 { - name device - x 119 - y 117 - } - } -} \ No newline at end of file diff --git a/tools/android/skins/pixel_tablet/mask.webp b/tools/android/skins/pixel_tablet/mask.webp deleted file mode 100644 index f7e99b8..0000000 Binary files a/tools/android/skins/pixel_tablet/mask.webp and /dev/null differ