AOSPAlliance / android-prepare-vendor

Set of scripts to automate AOSP compatible vendor blobs generation from factory images
24 stars 8 forks source link

Update taimen, walleye for android 11 #22

Closed danielfullmer closed 4 years ago

danielfullmer commented 4 years ago

I'm now also setting vendor-skip-files and have added the required modules to forced-modules.

Also includes two small miscellaneous fixes described in #12

chirayudesai commented 4 years ago

Another thing is would you mind just doing a quick diff of walleye and taimen once you make those changes?

They shouldn't differ too much I feel, would be good to see. Thanks!

chirayudesai commented 4 years ago

Note: There is a new system_ext

On taimen/walleye it's just under system, like product. so /system/system_ext like /system/product

Not seeing anything that we'd care about in the naked config there.

There's some of the stuff that's usually in the full config though, like CarrierSetup

danielfullmer commented 4 years ago

@chirayudesai Sure, here's a diff of their config.json files:

diff --git a/taimen/config.json b/walleye/config.json
index a65ec62..f25238c 100644
--- a/taimen/config.json
+++ b/walleye/config.json
@@ -1,30 +1,30 @@
 {
-  "device-name": "pixel2-xl",
-  "device-model": "taimen",
+  "device-name": "pixel2",
+  "device-model": "walleye",
   "device-aliases": [],
   "vendor": "google",
   "aosp-vendor-dir": "google_devices",
-  "device-family": "taimen",
+  "device-family": "muskie",
   "supported-apis": ["api-30"],
   "extra-partitions": [],
   "ota-partitions": [
     "abl",
-    "aes",
+    "apdp",
     "cmnlib",
     "cmnlib64",
     "devcfg",
     "hyp",
     "keymaster",
-    "laf",
     "modem",
+    "msadp",
     "pmic",
     "rpm",
     "tz",
     "xbl"
   ],
-  "AndroidMk": "taimen/Android.mk",
-  "BoardConfigVendorMk": "taimen/proprietary/BoardConfigVendor.mk",
-  "DeviceVendorMk": "taimen/proprietary/device-vendor.mk",
+  "AndroidMk": "walleye/Android.mk",
+  "BoardConfigVendorMk": "muskie/proprietary/BoardConfigVendor.mk",
+  "DeviceVendorMk": "muskie/proprietary/device-vendor-walleye.mk",
   "api-30": {
     "naked": {
       "overlays-dir": "",
@@ -444,14 +444,14 @@
         "lib/libwpa_client.so",
         "lib/mediacas/libclearkeycasplugin.so",
         "lib/mediadrm/libdrmclearkeyplugin.so",
-        "lib/modules/ftm4.ko",
-        "lib/modules/lge_battery.ko",
+        "lib/modules/htc_battery.ko",
         "lib/modules/modules.alias",
         "lib/modules/modules.dep",
         "lib/modules/modules.load",
         "lib/modules/modules.softdep",
-        "lib/modules/sw49408.ko",
-        "lib/modules/touch_core_base.ko",
+        "lib/modules/synaptics_dsx_core_htc.ko",
+        "lib/modules/synaptics_dsx_fw_update_htc.ko",
+        "lib/modules/synaptics_dsx_rmi_dev_htc.ko",
         "lib/modules/wlan.ko",
         "lib/soundfx/libaudiopreprocessing.so",
         "lib/soundfx/libbundlewrapper.so",
chirayudesai commented 4 years ago

Thanks for the changes and the diff.

It looks sane, just the hardware differences between the devices (and nothing else)