Pre Merge pull request !317 from yaofangyong/master

README.md

@@ -22,6 +22,14 @@
 ohpm install @ohos/imageknife
 ```
 
+## X86模拟器配置
+X86模拟器的前置条件参考：
+
+[申请鸿蒙开发套件](https://developer.huawei.com/consumer/cn/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100)
+
+备注：开发者需要申请HarmonyOS NEXT白名单权限。
+
+
 ## 使用说明  
 
 ### 1.依赖配置

build-profile.json5

@@ -4,8 +4,10 @@
       {
         "name": "default",
         "signingConfig": "default",
+        "compatibleSdkVersion": 12,
         "compileSdkVersion": 12,
-        "compatibleSdkVersion": 12
+        "targetSdkVersion": 12,
+        "runtimeOS": "OpenHarmony"
       }
     ],
     "buildModeSet": [

entry/src/main/module.json5

@@ -6,8 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default",
-      "tablet"
+      "default", "tablet", "phone", "tv", "wearable", "car", "2in1"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

entry/src/ohosTest/module.json5

@@ -5,7 +5,7 @@
     "srcEntry": "./ets/testability/TestAbility.ets",
     "description": "$string:module_test_desc",
     "mainElement": "TestAbility",
-    "deviceTypes": ["default"],
+    "deviceTypes": ["default", "tablet", "phone", "tv", "wearable", "car", "2in1"],
     "deliveryWithInstall": true,
     "installationFree": false,
     "pages": "$profile:test_pages",

gpu_transform/build-profile.json5

@@ -5,7 +5,7 @@
       "path": "./src/main/cpp/CMakeLists.txt",
       "arguments": " -DCMAKE_BUILD_TYPE=Release",
       "abiFilters": [
-        "armeabi-v7a",
+//        "armeabi-v7a",
         "arm64-v8a",
         "x86_64"
       ],

gpu_transform/src/main/module.json5

@@ -3,8 +3,7 @@
     "name": "gpu_transform",
     "type": "har",
     "deviceTypes": [
-      "default",
-      "tablet"
+      "default", "tablet", "phone", "tv", "wearable", "car", "2in1"
     ]
   }
 }

library/src/main/module.json5

@@ -3,8 +3,7 @@
     "name": "library",
     "type": "har",
     "deviceTypes": [
-      "default",
-      "tablet"
+      "default", "tablet", "phone", "tv", "wearable", "car", "2in1"
     ],
     "uiSyntax": "ets"
   }

sharedlibrary/src/main/module.json5

@@ -4,8 +4,7 @@
     "type": "shared",
     "description": "$string:shared_desc",
     "deviceTypes": [
-      "default",
-      "tablet"
+      "default", "tablet", "phone", "tv", "wearable", "car", "2in1"
     ],
     "deliveryWithInstall": true,
     "pages": "$profile:main_pages"

sharedlibrary2/src/main/module.json5

@@ -4,8 +4,7 @@
     "type": "shared",
     "description": "$string:shared_desc",
     "deviceTypes": [
-      "default",
-      "tablet"
+      "default", "tablet", "phone", "tv", "wearable", "car", "2in1"
     ],
     "deliveryWithInstall": true,
     "pages": "$profile:main_pages"