From dafe493930cd0109548fbc7dffdb0cc9078dd0d8 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Thu, 25 Jun 2020 04:24:03 -0700
Subject: [PATCH] Add architecture and sdk version information

Summary: This diff adds abilist and sdk version information in the AndroidDevice.

Reviewed By: mweststrate

Differential Revision: D22210225

fbshipit-source-id: cda3dea9d89fdaa62a08aa000c93e39177c67bdd
---
 desktop/app/src/devices/AndroidDevice.tsx    |  6 ++++++
 desktop/app/src/dispatcher/androidDevice.tsx | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/desktop/app/src/devices/AndroidDevice.tsx b/desktop/app/src/devices/AndroidDevice.tsx
index d2c9c5567..8eadf8fdd 100644
--- a/desktop/app/src/devices/AndroidDevice.tsx
+++ b/desktop/app/src/devices/AndroidDevice.tsx
@@ -21,10 +21,14 @@ export default class AndroidDevice extends BaseDevice {
     deviceType: DeviceType,
     title: string,
     adb: ADBClient,
+    abiList: Array<string>,
+    sdkVersion: string,
   ) {
     super(serial, deviceType, title, 'Android');
     this.adb = adb;
     this.icon = 'icons/android.svg';
+    this.abiList = abiList;
+    this.sdkVersion = sdkVersion;
     this.adb.openLogcat(this.serial).then((reader) => {
       reader.on('entry', (entry) => {
         let type: LogLevel = 'unknown';
@@ -60,6 +64,8 @@ export default class AndroidDevice extends BaseDevice {
   }
 
   adb: ADBClient;
+  abiList: Array<string> = [];
+  sdkVersion: string | undefined = undefined;
   pidAppMapping: {[key: number]: string} = {};
   private recordingProcess?: Promise<string>;
 
diff --git a/desktop/app/src/dispatcher/androidDevice.tsx b/desktop/app/src/dispatcher/androidDevice.tsx
index d3f9fb0a1..13ab7b9e1 100644
--- a/desktop/app/src/dispatcher/androidDevice.tsx
+++ b/desktop/app/src/dispatcher/androidDevice.tsx
@@ -36,6 +36,9 @@ function createDevice(
       .then(async (props) => {
         try {
           let name = props['ro.product.model'];
+          const abiString = props['ro.product.cpu.abilist'];
+          const sdkVersion = props['ro.build.version.sdk'];
+          const abiList = abiString.length > 0 ? abiString.split(',') : [];
           if (type === 'emulator') {
             name = (await getRunningEmulatorName(device.id)) || name;
           }
@@ -44,7 +47,14 @@ function createDevice(
           );
           const androidLikeDevice = new (isKaiOSDevice
             ? KaiOSDevice
-            : AndroidDevice)(device.id, type, name, adbClient);
+            : AndroidDevice)(
+            device.id,
+            type,
+            name,
+            adbClient,
+            abiList,
+            sdkVersion,
+          );
           if (ports) {
             await androidLikeDevice
               .reverse([ports.secure, ports.insecure])