Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		
						commit
						ee1f1e1636
					
				| @ -2,6 +2,11 @@ | |||||||
|   "apiType": 'stageMode', |   "apiType": 'stageMode', | ||||||
|   "buildOption": { |   "buildOption": { | ||||||
|     "externalNativeOptions": { |     "externalNativeOptions": { | ||||||
|  |       "abiFilters": [ | ||||||
|  |         "arm64-v8a", | ||||||
|  |         "armeabi-v7a", | ||||||
|  |         "x86_64" | ||||||
|  |       ], | ||||||
|       "path": "./src/main/cpp/CMakeLists.txt", |       "path": "./src/main/cpp/CMakeLists.txt", | ||||||
|       "arguments": "", |       "arguments": "", | ||||||
|       "cppFlags": "", |       "cppFlags": "", | ||||||
|  | |||||||
| @ -1,13 +1,15 @@ | |||||||
| { | { | ||||||
|   "lockfileVersion": 1, |   "lockfileVersion": 2, | ||||||
|   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", |   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", | ||||||
|   "specifiers": { |   "specifiers": { | ||||||
|     "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" |     "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" | ||||||
|   }, |   }, | ||||||
|   "packages": { |   "packages": { | ||||||
|     "@ohos/hypium@1.0.6": { |     "@ohos/hypium@1.0.6": { | ||||||
|       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", |       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", | ||||||
|       "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" |       "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==", | ||||||
|  |       "registryType": "ohpm", | ||||||
|  |       "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1" | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user