Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9054c13c authored by Chris Poultney's avatar Chris Poultney
Browse files

Fixes WallpaperPickerGoogle Studio build 

Fixes the resource issues introduced to Studio by ag/25842216 and ag/25839209

Fixes: 323334670
Flag: NONE
Test: Manually built and ran all AOSP and Google targets
Test: Manually ran instrumented and deviceless tests for all targets in
Studio and with atest

Change-Id: I4aa91e6a22f2eb825e770dcd4049ce312d66038d
parent 570b67cc

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ prebuilt_etc { 
//

android_app {

    name: "ThemePicker",

    package_name: "com.android.wallpaper",

    defaults: ["ThemePicker_defaults"],



    platform_apis: true,

AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- The package name here must match the Studio namespace given in

     WallpaperPickerGoogle gradle config for Studio builds to succeed.

     `package_name` in Android.bp overrides this with the actual package name.

 -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wallpaper">

          package="com.google.android.apps.wallpaper">



    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="28"/>