Change the package name of webgpu kotlin bindings to androidx.webgpu
Change-Id: I0cfc367d4b5f343b41fefa2d70c668b07a11ab94
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/256914
Reviewed-by: Jim Blackler <jimblackler@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Barış Kaya <bkaya@google.com>
diff --git a/src/dawn/dawn_kotlin.json b/src/dawn/dawn_kotlin.json
index 4e419ec..d4dc8c0 100644
--- a/src/dawn/dawn_kotlin.json
+++ b/src/dawn/dawn_kotlin.json
@@ -30,7 +30,7 @@
"_doc": "See docs/dawn/codegen.md",
- "kotlin_package": "android.dawn",
+ "kotlin_package": "androidx.webgpu",
"jni_primitives" : {
"bool": "jboolean",
diff --git a/tools/android/BUILD.gn b/tools/android/BUILD.gn
index 63af668..3ed0f2e 100644
--- a/tools/android/BUILD.gn
+++ b/tools/android/BUILD.gn
@@ -43,179 +43,179 @@
dawn_json_generator("kotlin_gen") {
target = "kotlin"
outputs = [
- "java/android/dawn/Adapter.kt",
- "java/android/dawn/AdapterInfo.kt",
- "java/android/dawn/AdapterType.kt",
- "java/android/dawn/AddressMode.kt",
- "java/android/dawn/AsyncHelpers.kt",
- "java/android/dawn/BackendType.kt",
- "java/android/dawn/BindGroup.kt",
- "java/android/dawn/BindGroupDescriptor.kt",
- "java/android/dawn/BindGroupEntry.kt",
- "java/android/dawn/BindGroupLayout.kt",
- "java/android/dawn/BindGroupLayoutDescriptor.kt",
- "java/android/dawn/BindGroupLayoutEntry.kt",
- "java/android/dawn/BlendComponent.kt",
- "java/android/dawn/BlendFactor.kt",
- "java/android/dawn/BlendOperation.kt",
- "java/android/dawn/BlendState.kt",
- "java/android/dawn/Buffer.kt",
- "java/android/dawn/BufferBindingLayout.kt",
- "java/android/dawn/BufferBindingType.kt",
- "java/android/dawn/BufferDescriptor.kt",
- "java/android/dawn/BufferMapCallback.kt",
- "java/android/dawn/BufferMapCallbackInfo.kt",
- "java/android/dawn/BufferMapState.kt",
- "java/android/dawn/BufferUsage.kt",
- "java/android/dawn/CallbackMode.kt",
- "java/android/dawn/Color.kt",
- "java/android/dawn/ColorTargetState.kt",
- "java/android/dawn/ColorWriteMask.kt",
- "java/android/dawn/CommandBuffer.kt",
- "java/android/dawn/CommandBufferDescriptor.kt",
- "java/android/dawn/CommandEncoder.kt",
- "java/android/dawn/CommandEncoderDescriptor.kt",
- "java/android/dawn/CompareFunction.kt",
- "java/android/dawn/CompilationInfo.kt",
- "java/android/dawn/CompilationInfoCallback.kt",
- "java/android/dawn/CompilationInfoCallbackInfo.kt",
- "java/android/dawn/CompilationInfoRequestStatus.kt",
- "java/android/dawn/CompilationMessage.kt",
- "java/android/dawn/CompilationMessageType.kt",
- "java/android/dawn/CompositeAlphaMode.kt",
- "java/android/dawn/ComputePassDescriptor.kt",
- "java/android/dawn/ComputePassEncoder.kt",
- "java/android/dawn/ComputePipeline.kt",
- "java/android/dawn/ComputePipelineDescriptor.kt",
- "java/android/dawn/ComputeState.kt",
- "java/android/dawn/ConstantEntry.kt",
- "java/android/dawn/Constants.kt",
- "java/android/dawn/CreateComputePipelineAsyncCallback.kt",
- "java/android/dawn/CreateComputePipelineAsyncCallbackInfo.kt",
- "java/android/dawn/CreatePipelineAsyncStatus.kt",
- "java/android/dawn/CreateRenderPipelineAsyncCallback.kt",
- "java/android/dawn/CreateRenderPipelineAsyncCallbackInfo.kt",
- "java/android/dawn/CullMode.kt",
- "java/android/dawn/DepthStencilState.kt",
- "java/android/dawn/Device.kt",
- "java/android/dawn/DeviceDescriptor.kt",
- "java/android/dawn/DeviceLostCallback.kt",
- "java/android/dawn/DeviceLostCallbackInfo.kt",
- "java/android/dawn/DeviceLostReason.kt",
- "java/android/dawn/ErrorFilter.kt",
- "java/android/dawn/ErrorType.kt",
- "java/android/dawn/Extent3D.kt",
- "java/android/dawn/FeatureLevel.kt",
- "java/android/dawn/FeatureName.kt",
- "java/android/dawn/FilterMode.kt",
- "java/android/dawn/FragmentState.kt",
- "java/android/dawn/FrontFace.kt",
- "java/android/dawn/Functions.kt",
- "java/android/dawn/Future.kt",
- "java/android/dawn/FutureWaitInfo.kt",
- "java/android/dawn/IndexFormat.kt",
- "java/android/dawn/Instance.kt",
- "java/android/dawn/InstanceDescriptor.kt",
- "java/android/dawn/InstanceFeatureName.kt",
- "java/android/dawn/InstanceLimits.kt",
- "java/android/dawn/Limits.kt",
- "java/android/dawn/LoadOp.kt",
- "java/android/dawn/MapAsyncStatus.kt",
- "java/android/dawn/MapMode.kt",
- "java/android/dawn/MipmapFilterMode.kt",
- "java/android/dawn/MultisampleState.kt",
- "java/android/dawn/OptionalBool.kt",
- "java/android/dawn/Origin3D.kt",
- "java/android/dawn/PassTimestampWrites.kt",
- "java/android/dawn/PipelineLayout.kt",
- "java/android/dawn/PipelineLayoutDescriptor.kt",
- "java/android/dawn/PopErrorScopeCallback.kt",
- "java/android/dawn/PopErrorScopeCallbackInfo.kt",
- "java/android/dawn/PopErrorScopeStatus.kt",
- "java/android/dawn/PowerPreference.kt",
- "java/android/dawn/PredefinedColorSpace.kt",
- "java/android/dawn/PresentMode.kt",
- "java/android/dawn/PrimitiveState.kt",
- "java/android/dawn/PrimitiveTopology.kt",
- "java/android/dawn/Proc.kt",
- "java/android/dawn/QuerySet.kt",
- "java/android/dawn/QuerySetDescriptor.kt",
- "java/android/dawn/QueryType.kt",
- "java/android/dawn/Queue.kt",
- "java/android/dawn/QueueDescriptor.kt",
- "java/android/dawn/QueueWorkDoneCallback.kt",
- "java/android/dawn/QueueWorkDoneCallbackInfo.kt",
- "java/android/dawn/QueueWorkDoneStatus.kt",
- "java/android/dawn/RenderBundle.kt",
- "java/android/dawn/RenderBundleDescriptor.kt",
- "java/android/dawn/RenderBundleEncoder.kt",
- "java/android/dawn/RenderBundleEncoderDescriptor.kt",
- "java/android/dawn/RenderPassColorAttachment.kt",
- "java/android/dawn/RenderPassDepthStencilAttachment.kt",
- "java/android/dawn/RenderPassDescriptor.kt",
- "java/android/dawn/RenderPassEncoder.kt",
- "java/android/dawn/RenderPassMaxDrawCount.kt",
- "java/android/dawn/RenderPipeline.kt",
- "java/android/dawn/RenderPipelineDescriptor.kt",
- "java/android/dawn/RequestAdapterCallback.kt",
- "java/android/dawn/RequestAdapterCallbackInfo.kt",
- "java/android/dawn/RequestAdapterOptions.kt",
- "java/android/dawn/RequestAdapterStatus.kt",
- "java/android/dawn/RequestAdapterWebXROptions.kt",
- "java/android/dawn/RequestDeviceCallback.kt",
- "java/android/dawn/RequestDeviceCallbackInfo.kt",
- "java/android/dawn/RequestDeviceStatus.kt",
- "java/android/dawn/SType.kt",
- "java/android/dawn/Sampler.kt",
- "java/android/dawn/SamplerBindingLayout.kt",
- "java/android/dawn/SamplerBindingType.kt",
- "java/android/dawn/SamplerDescriptor.kt",
- "java/android/dawn/ShaderModule.kt",
- "java/android/dawn/ShaderModuleDescriptor.kt",
- "java/android/dawn/ShaderSourceSPIRV.kt",
- "java/android/dawn/ShaderSourceWGSL.kt",
- "java/android/dawn/ShaderStage.kt",
- "java/android/dawn/Status.kt",
- "java/android/dawn/StencilFaceState.kt",
- "java/android/dawn/StencilOperation.kt",
- "java/android/dawn/StorageTextureAccess.kt",
- "java/android/dawn/StorageTextureBindingLayout.kt",
- "java/android/dawn/StoreOp.kt",
- "java/android/dawn/SupportedFeatures.kt",
- "java/android/dawn/SupportedInstanceFeatures.kt",
- "java/android/dawn/SupportedWGSLLanguageFeatures.kt",
- "java/android/dawn/Surface.kt",
- "java/android/dawn/SurfaceCapabilities.kt",
- "java/android/dawn/SurfaceColorManagement.kt",
- "java/android/dawn/SurfaceConfiguration.kt",
- "java/android/dawn/SurfaceDescriptor.kt",
- "java/android/dawn/SurfaceGetCurrentTextureStatus.kt",
- "java/android/dawn/SurfaceSourceAndroidNativeWindow.kt",
- "java/android/dawn/SurfaceTexture.kt",
- "java/android/dawn/Texture.kt",
- "java/android/dawn/TexelCopyBufferInfo.kt",
- "java/android/dawn/TexelCopyBufferLayout.kt",
- "java/android/dawn/TexelCopyTextureInfo.kt",
- "java/android/dawn/TextureAspect.kt",
- "java/android/dawn/TextureBindingLayout.kt",
- "java/android/dawn/TextureDescriptor.kt",
- "java/android/dawn/TextureDimension.kt",
- "java/android/dawn/TextureFormat.kt",
- "java/android/dawn/TextureSampleType.kt",
- "java/android/dawn/TextureUsage.kt",
- "java/android/dawn/TextureView.kt",
- "java/android/dawn/TextureViewDescriptor.kt",
- "java/android/dawn/TextureViewDimension.kt",
- "java/android/dawn/ToneMappingMode.kt",
- "java/android/dawn/UncapturedErrorCallback.kt",
- "java/android/dawn/UncapturedErrorCallbackInfo.kt",
- "java/android/dawn/VertexAttribute.kt",
- "java/android/dawn/VertexBufferLayout.kt",
- "java/android/dawn/VertexFormat.kt",
- "java/android/dawn/VertexState.kt",
- "java/android/dawn/VertexStepMode.kt",
- "java/android/dawn/WGSLLanguageFeatureName.kt",
- "java/android/dawn/WaitStatus.kt",
+ "java/androidx/webgpu/Adapter.kt",
+ "java/androidx/webgpu/AdapterInfo.kt",
+ "java/androidx/webgpu/AdapterType.kt",
+ "java/androidx/webgpu/AddressMode.kt",
+ "java/androidx/webgpu/AsyncHelpers.kt",
+ "java/androidx/webgpu/BackendType.kt",
+ "java/androidx/webgpu/BindGroup.kt",
+ "java/androidx/webgpu/BindGroupDescriptor.kt",
+ "java/androidx/webgpu/BindGroupEntry.kt",
+ "java/androidx/webgpu/BindGroupLayout.kt",
+ "java/androidx/webgpu/BindGroupLayoutDescriptor.kt",
+ "java/androidx/webgpu/BindGroupLayoutEntry.kt",
+ "java/androidx/webgpu/BlendComponent.kt",
+ "java/androidx/webgpu/BlendFactor.kt",
+ "java/androidx/webgpu/BlendOperation.kt",
+ "java/androidx/webgpu/BlendState.kt",
+ "java/androidx/webgpu/Buffer.kt",
+ "java/androidx/webgpu/BufferBindingLayout.kt",
+ "java/androidx/webgpu/BufferBindingType.kt",
+ "java/androidx/webgpu/BufferDescriptor.kt",
+ "java/androidx/webgpu/BufferMapCallback.kt",
+ "java/androidx/webgpu/BufferMapCallbackInfo.kt",
+ "java/androidx/webgpu/BufferMapState.kt",
+ "java/androidx/webgpu/BufferUsage.kt",
+ "java/androidx/webgpu/CallbackMode.kt",
+ "java/androidx/webgpu/Color.kt",
+ "java/androidx/webgpu/ColorTargetState.kt",
+ "java/androidx/webgpu/ColorWriteMask.kt",
+ "java/androidx/webgpu/CommandBuffer.kt",
+ "java/androidx/webgpu/CommandBufferDescriptor.kt",
+ "java/androidx/webgpu/CommandEncoder.kt",
+ "java/androidx/webgpu/CommandEncoderDescriptor.kt",
+ "java/androidx/webgpu/CompareFunction.kt",
+ "java/androidx/webgpu/CompilationInfo.kt",
+ "java/androidx/webgpu/CompilationInfoCallback.kt",
+ "java/androidx/webgpu/CompilationInfoCallbackInfo.kt",
+ "java/androidx/webgpu/CompilationInfoRequestStatus.kt",
+ "java/androidx/webgpu/CompilationMessage.kt",
+ "java/androidx/webgpu/CompilationMessageType.kt",
+ "java/androidx/webgpu/CompositeAlphaMode.kt",
+ "java/androidx/webgpu/ComputePassDescriptor.kt",
+ "java/androidx/webgpu/ComputePassEncoder.kt",
+ "java/androidx/webgpu/ComputePipeline.kt",
+ "java/androidx/webgpu/ComputePipelineDescriptor.kt",
+ "java/androidx/webgpu/ComputeState.kt",
+ "java/androidx/webgpu/ConstantEntry.kt",
+ "java/androidx/webgpu/Constants.kt",
+ "java/androidx/webgpu/CreateComputePipelineAsyncCallback.kt",
+ "java/androidx/webgpu/CreateComputePipelineAsyncCallbackInfo.kt",
+ "java/androidx/webgpu/CreatePipelineAsyncStatus.kt",
+ "java/androidx/webgpu/CreateRenderPipelineAsyncCallback.kt",
+ "java/androidx/webgpu/CreateRenderPipelineAsyncCallbackInfo.kt",
+ "java/androidx/webgpu/CullMode.kt",
+ "java/androidx/webgpu/DepthStencilState.kt",
+ "java/androidx/webgpu/Device.kt",
+ "java/androidx/webgpu/DeviceDescriptor.kt",
+ "java/androidx/webgpu/DeviceLostCallback.kt",
+ "java/androidx/webgpu/DeviceLostCallbackInfo.kt",
+ "java/androidx/webgpu/DeviceLostReason.kt",
+ "java/androidx/webgpu/ErrorFilter.kt",
+ "java/androidx/webgpu/ErrorType.kt",
+ "java/androidx/webgpu/Extent3D.kt",
+ "java/androidx/webgpu/FeatureLevel.kt",
+ "java/androidx/webgpu/FeatureName.kt",
+ "java/androidx/webgpu/FilterMode.kt",
+ "java/androidx/webgpu/FragmentState.kt",
+ "java/androidx/webgpu/FrontFace.kt",
+ "java/androidx/webgpu/Functions.kt",
+ "java/androidx/webgpu/Future.kt",
+ "java/androidx/webgpu/FutureWaitInfo.kt",
+ "java/androidx/webgpu/IndexFormat.kt",
+ "java/androidx/webgpu/Instance.kt",
+ "java/androidx/webgpu/InstanceDescriptor.kt",
+ "java/androidx/webgpu/InstanceFeatureName.kt",
+ "java/androidx/webgpu/InstanceLimits.kt",
+ "java/androidx/webgpu/Limits.kt",
+ "java/androidx/webgpu/LoadOp.kt",
+ "java/androidx/webgpu/MapAsyncStatus.kt",
+ "java/androidx/webgpu/MapMode.kt",
+ "java/androidx/webgpu/MipmapFilterMode.kt",
+ "java/androidx/webgpu/MultisampleState.kt",
+ "java/androidx/webgpu/OptionalBool.kt",
+ "java/androidx/webgpu/Origin3D.kt",
+ "java/androidx/webgpu/PassTimestampWrites.kt",
+ "java/androidx/webgpu/PipelineLayout.kt",
+ "java/androidx/webgpu/PipelineLayoutDescriptor.kt",
+ "java/androidx/webgpu/PopErrorScopeCallback.kt",
+ "java/androidx/webgpu/PopErrorScopeCallbackInfo.kt",
+ "java/androidx/webgpu/PopErrorScopeStatus.kt",
+ "java/androidx/webgpu/PowerPreference.kt",
+ "java/androidx/webgpu/PredefinedColorSpace.kt",
+ "java/androidx/webgpu/PresentMode.kt",
+ "java/androidx/webgpu/PrimitiveState.kt",
+ "java/androidx/webgpu/PrimitiveTopology.kt",
+ "java/androidx/webgpu/Proc.kt",
+ "java/androidx/webgpu/QuerySet.kt",
+ "java/androidx/webgpu/QuerySetDescriptor.kt",
+ "java/androidx/webgpu/QueryType.kt",
+ "java/androidx/webgpu/Queue.kt",
+ "java/androidx/webgpu/QueueDescriptor.kt",
+ "java/androidx/webgpu/QueueWorkDoneCallback.kt",
+ "java/androidx/webgpu/QueueWorkDoneCallbackInfo.kt",
+ "java/androidx/webgpu/QueueWorkDoneStatus.kt",
+ "java/androidx/webgpu/RenderBundle.kt",
+ "java/androidx/webgpu/RenderBundleDescriptor.kt",
+ "java/androidx/webgpu/RenderBundleEncoder.kt",
+ "java/androidx/webgpu/RenderBundleEncoderDescriptor.kt",
+ "java/androidx/webgpu/RenderPassColorAttachment.kt",
+ "java/androidx/webgpu/RenderPassDepthStencilAttachment.kt",
+ "java/androidx/webgpu/RenderPassDescriptor.kt",
+ "java/androidx/webgpu/RenderPassEncoder.kt",
+ "java/androidx/webgpu/RenderPassMaxDrawCount.kt",
+ "java/androidx/webgpu/RenderPipeline.kt",
+ "java/androidx/webgpu/RenderPipelineDescriptor.kt",
+ "java/androidx/webgpu/RequestAdapterCallback.kt",
+ "java/androidx/webgpu/RequestAdapterCallbackInfo.kt",
+ "java/androidx/webgpu/RequestAdapterOptions.kt",
+ "java/androidx/webgpu/RequestAdapterStatus.kt",
+ "java/androidx/webgpu/RequestAdapterWebXROptions.kt",
+ "java/androidx/webgpu/RequestDeviceCallback.kt",
+ "java/androidx/webgpu/RequestDeviceCallbackInfo.kt",
+ "java/androidx/webgpu/RequestDeviceStatus.kt",
+ "java/androidx/webgpu/SType.kt",
+ "java/androidx/webgpu/Sampler.kt",
+ "java/androidx/webgpu/SamplerBindingLayout.kt",
+ "java/androidx/webgpu/SamplerBindingType.kt",
+ "java/androidx/webgpu/SamplerDescriptor.kt",
+ "java/androidx/webgpu/ShaderModule.kt",
+ "java/androidx/webgpu/ShaderModuleDescriptor.kt",
+ "java/androidx/webgpu/ShaderSourceSPIRV.kt",
+ "java/androidx/webgpu/ShaderSourceWGSL.kt",
+ "java/androidx/webgpu/ShaderStage.kt",
+ "java/androidx/webgpu/Status.kt",
+ "java/androidx/webgpu/StencilFaceState.kt",
+ "java/androidx/webgpu/StencilOperation.kt",
+ "java/androidx/webgpu/StorageTextureAccess.kt",
+ "java/androidx/webgpu/StorageTextureBindingLayout.kt",
+ "java/androidx/webgpu/StoreOp.kt",
+ "java/androidx/webgpu/SupportedFeatures.kt",
+ "java/androidx/webgpu/SupportedInstanceFeatures.kt",
+ "java/androidx/webgpu/SupportedWGSLLanguageFeatures.kt",
+ "java/androidx/webgpu/Surface.kt",
+ "java/androidx/webgpu/SurfaceCapabilities.kt",
+ "java/androidx/webgpu/SurfaceColorManagement.kt",
+ "java/androidx/webgpu/SurfaceConfiguration.kt",
+ "java/androidx/webgpu/SurfaceDescriptor.kt",
+ "java/androidx/webgpu/SurfaceGetCurrentTextureStatus.kt",
+ "java/androidx/webgpu/SurfaceSourceAndroidNativeWindow.kt",
+ "java/androidx/webgpu/SurfaceTexture.kt",
+ "java/androidx/webgpu/Texture.kt",
+ "java/androidx/webgpu/TexelCopyBufferInfo.kt",
+ "java/androidx/webgpu/TexelCopyBufferLayout.kt",
+ "java/androidx/webgpu/TexelCopyTextureInfo.kt",
+ "java/androidx/webgpu/TextureAspect.kt",
+ "java/androidx/webgpu/TextureBindingLayout.kt",
+ "java/androidx/webgpu/TextureDescriptor.kt",
+ "java/androidx/webgpu/TextureDimension.kt",
+ "java/androidx/webgpu/TextureFormat.kt",
+ "java/androidx/webgpu/TextureSampleType.kt",
+ "java/androidx/webgpu/TextureUsage.kt",
+ "java/androidx/webgpu/TextureView.kt",
+ "java/androidx/webgpu/TextureViewDescriptor.kt",
+ "java/androidx/webgpu/TextureViewDimension.kt",
+ "java/androidx/webgpu/ToneMappingMode.kt",
+ "java/androidx/webgpu/UncapturedErrorCallback.kt",
+ "java/androidx/webgpu/UncapturedErrorCallbackInfo.kt",
+ "java/androidx/webgpu/VertexAttribute.kt",
+ "java/androidx/webgpu/VertexBufferLayout.kt",
+ "java/androidx/webgpu/VertexFormat.kt",
+ "java/androidx/webgpu/VertexState.kt",
+ "java/androidx/webgpu/VertexStepMode.kt",
+ "java/androidx/webgpu/WGSLLanguageFeatureName.kt",
+ "java/androidx/webgpu/WaitStatus.kt",
]
}
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/AdapterTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/AdapterTest.kt
similarity index 93%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/AdapterTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/AdapterTest.kt
index fd8b521..26baaf9 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/AdapterTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/AdapterTest.kt
@@ -1,7 +1,7 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.Util
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webgpu.helper.Util
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/AsyncHelperTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/AsyncHelperTest.kt
similarity index 97%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/AsyncHelperTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/AsyncHelperTest.kt
index 0717bb3..4083efb 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/AsyncHelperTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/AsyncHelperTest.kt
@@ -1,6 +1,7 @@
-package android.dawn
-import android.dawn.helper.createWebGpu
+package androidx.webgpu
+
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webgpu.helper.createWebGpu
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/BitmapUtils.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/BitmapUtils.kt
similarity index 95%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/BitmapUtils.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/BitmapUtils.kt
index d86a0f9..f67ffa1 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/BitmapUtils.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/BitmapUtils.kt
@@ -1,4 +1,4 @@
-package android.dawn
+package androidx.webgpu
import android.graphics.Bitmap
import android.os.Environment
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/BufferTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/BufferTest.kt
similarity index 94%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/BufferTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/BufferTest.kt
index 4dabc07..ecf6644 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/BufferTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/BufferTest.kt
@@ -1,6 +1,6 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.createWebGpu
+import androidx.webgpu.helper.createWebGpu
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertThrows
import org.junit.Test
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/ErrorTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ErrorTest.kt
similarity index 86%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/ErrorTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/ErrorTest.kt
index 1b964e0..c465af1 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/ErrorTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ErrorTest.kt
@@ -1,8 +1,8 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.UncapturedErrorException
-import android.dawn.helper.createWebGpu
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webgpu.helper.UncapturedErrorException
+import androidx.webgpu.helper.createWebGpu
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertThrows
import org.junit.Test
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/FeaturesTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/FeaturesTest.kt
similarity index 92%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/FeaturesTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/FeaturesTest.kt
index bf3a61e..67473d3 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/FeaturesTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/FeaturesTest.kt
@@ -1,7 +1,7 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.createWebGpu
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webgpu.helper.createWebGpu
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/ImageCompare.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageCompare.kt
similarity index 97%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/ImageCompare.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageCompare.kt
index 8b84840..720af17 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/ImageCompare.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageCompare.kt
@@ -1,4 +1,4 @@
-package android.dawn
+package androidx.webgpu
import android.graphics.Bitmap
import kotlin.math.pow
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/ImageTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageTest.kt
similarity index 96%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/ImageTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageTest.kt
index f6930db..de4472c 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/ImageTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ImageTest.kt
@@ -1,13 +1,13 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.asString
-import android.dawn.helper.createBitmap
-import android.dawn.helper.createWebGpu
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.services.storage.TestStorage
+import androidx.webgpu.helper.asString
+import androidx.webgpu.helper.createBitmap
+import androidx.webgpu.helper.createWebGpu
import junit.framework.TestCase.assertEquals
import kotlinx.coroutines.runBlocking
import org.junit.Test
diff --git a/tools/android/webgpu/src/androidTest/java/android/dawn/ObjectTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ObjectTest.kt
similarity index 96%
rename from tools/android/webgpu/src/androidTest/java/android/dawn/ObjectTest.kt
rename to tools/android/webgpu/src/androidTest/java/androidx/webgpu/ObjectTest.kt
index 6e5ba09..62dd6f3 100644
--- a/tools/android/webgpu/src/androidTest/java/android/dawn/ObjectTest.kt
+++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/ObjectTest.kt
@@ -1,7 +1,7 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.Util
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.webgpu.helper.Util
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/tools/android/webgpu/src/main/cpp/Util.cpp b/tools/android/webgpu/src/main/cpp/Util.cpp
index 1b86264..58c554e 100644
--- a/tools/android/webgpu/src/main/cpp/Util.cpp
+++ b/tools/android/webgpu/src/main/cpp/Util.cpp
@@ -30,6 +30,6 @@
#include <android/native_window_jni.h>
extern "C" JNIEXPORT jlong JNICALL
-Java_android_dawn_helper_Util_windowFromSurface(JNIEnv* env, jclass thiz, jobject surface) {
+Java_androidx_webgpu_helper_Util_windowFromSurface(JNIEnv* env, jclass thiz, jobject surface) {
return reinterpret_cast<jlong>(ANativeWindow_fromSurface(env, surface));
}
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/DawnException.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/DawnException.kt
similarity index 67%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/DawnException.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/DawnException.kt
index 285c32a..4a8b14e 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/DawnException.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/DawnException.kt
@@ -1,3 +1,3 @@
-package android.dawn.helper
+package androidx.webgpu.helper
public class DawnException(message:String): Exception(message)
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/Rounding.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Rounding.kt
similarity index 96%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/Rounding.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/Rounding.kt
index 461569e..39c7a55 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/Rounding.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Rounding.kt
@@ -1,4 +1,4 @@
-package android.dawn.helper
+package androidx.webgpu.helper
/**
* Helpers for image dimension management. Each adds a method to round to the next higher
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/Streams.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Streams.kt
similarity index 90%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/Streams.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/Streams.kt
index da551ec..9f03989 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/Streams.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Streams.kt
@@ -1,4 +1,4 @@
-package android.dawn.helper
+package androidx.webgpu.helper
import java.io.InputStream
import java.io.InputStreamReader
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/Textures.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Textures.kt
similarity index 97%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/Textures.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/Textures.kt
index b28bf3d..89ea9c7 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/Textures.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Textures.kt
@@ -1,7 +1,7 @@
-package android.dawn.helper
+package androidx.webgpu.helper
-import android.dawn.*
import android.graphics.Bitmap
+import androidx.webgpu.*
import java.nio.ByteBuffer
public fun Bitmap.createGpuTexture(device: Device): Texture {
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Util.kt
similarity index 85%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/Util.kt
index 4d353c6..7b849d3 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/Util.kt
@@ -1,4 +1,4 @@
-package android.dawn.helper
+package androidx.webgpu.helper
import android.view.Surface
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/WebGpu.kt b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/WebGpu.kt
similarity index 79%
rename from tools/android/webgpu/src/main/java/android/dawn/helper/WebGpu.kt
rename to tools/android/webgpu/src/main/java/androidx/webgpu/helper/WebGpu.kt
index f168d7a..f067239 100644
--- a/tools/android/webgpu/src/main/java/android/dawn/helper/WebGpu.kt
+++ b/tools/android/webgpu/src/main/java/androidx/webgpu/helper/WebGpu.kt
@@ -1,30 +1,30 @@
-package android.dawn.helper
+package androidx.webgpu.helper
-import android.dawn.Adapter
-import android.dawn.BackendType
-import android.dawn.CallbackMode.Companion.AllowSpontaneous
-import android.dawn.Device
-import android.dawn.DeviceDescriptor
-import android.dawn.DeviceLostCallback
-import android.dawn.DeviceLostCallbackInfo
-import android.dawn.DeviceLostReason
-import android.dawn.ErrorType
-import android.dawn.FeatureName
-import android.dawn.Instance
-import android.dawn.InstanceDescriptor
-import android.dawn.RequestAdapterOptions
-import android.dawn.RequestAdapterStatus
-import android.dawn.RequestDeviceStatus
-import android.dawn.SurfaceDescriptor
-import android.dawn.SurfaceSourceAndroidNativeWindow
-import android.dawn.UncapturedErrorCallbackInfo
-import android.dawn.createInstance
-import android.dawn.helper.Util.windowFromSurface
-import android.dawn.requestAdapter
-import android.dawn.requestDevice
import android.os.Handler
import android.os.Looper
import android.view.Surface
+import androidx.webgpu.Adapter
+import androidx.webgpu.BackendType
+import androidx.webgpu.CallbackMode.Companion.AllowSpontaneous
+import androidx.webgpu.Device
+import androidx.webgpu.DeviceDescriptor
+import androidx.webgpu.DeviceLostCallback
+import androidx.webgpu.DeviceLostCallbackInfo
+import androidx.webgpu.DeviceLostReason
+import androidx.webgpu.ErrorType
+import androidx.webgpu.FeatureName
+import androidx.webgpu.Instance
+import androidx.webgpu.InstanceDescriptor
+import androidx.webgpu.RequestAdapterOptions
+import androidx.webgpu.RequestAdapterStatus
+import androidx.webgpu.RequestDeviceStatus
+import androidx.webgpu.SurfaceDescriptor
+import androidx.webgpu.SurfaceSourceAndroidNativeWindow
+import androidx.webgpu.UncapturedErrorCallbackInfo
+import androidx.webgpu.createInstance
+import androidx.webgpu.helper.Util.windowFromSurface
+import androidx.webgpu.requestAdapter
+import androidx.webgpu.requestDevice
public class DeviceLostException(
public val device: Device, public val reason: DeviceLostReason, message: String
@@ -38,7 +38,7 @@
public abstract class WebGpu : AutoCloseable {
public abstract val instance: Instance
- public abstract val webgpuSurface: android.dawn.Surface
+ public abstract val webgpuSurface: androidx.webgpu.Surface
public abstract val device: Device
}
diff --git a/tools/android/webgpu/src/test/java/android/dawn/EnumsTest.kt b/tools/android/webgpu/src/test/java/androidx/webgpu/EnumsTest.kt
similarity index 94%
rename from tools/android/webgpu/src/test/java/android/dawn/EnumsTest.kt
rename to tools/android/webgpu/src/test/java/androidx/webgpu/EnumsTest.kt
index 25f1026..c98ffee 100644
--- a/tools/android/webgpu/src/test/java/android/dawn/EnumsTest.kt
+++ b/tools/android/webgpu/src/test/java/androidx/webgpu/EnumsTest.kt
@@ -1,4 +1,4 @@
-package android.dawn
+package androidx.webgpu
import org.junit.Test
diff --git a/tools/android/webgpu/src/test/java/android/dawn/MappedNamedConstantsTest.kt b/tools/android/webgpu/src/test/java/androidx/webgpu/MappedNamedConstantsTest.kt
similarity index 96%
rename from tools/android/webgpu/src/test/java/android/dawn/MappedNamedConstantsTest.kt
rename to tools/android/webgpu/src/test/java/androidx/webgpu/MappedNamedConstantsTest.kt
index 99105bf..41c5359 100644
--- a/tools/android/webgpu/src/test/java/android/dawn/MappedNamedConstantsTest.kt
+++ b/tools/android/webgpu/src/test/java/androidx/webgpu/MappedNamedConstantsTest.kt
@@ -1,4 +1,4 @@
-package android.dawn
+package androidx.webgpu
import java.net.URL
import java.util.jar.JarFile
@@ -110,10 +110,10 @@
*/
@Test
fun testPackageClassesMatchTestTargets() {
- val dawnClasses = classNames("android.dawn")
+ val dawnClasses = classNames("androidx.webgpu")
val actual = dawnClasses.filter { clazz ->
isAndroidDawn(clazz) && hasCompanionObjectWithNames(clazz)
- }.map { it.removePrefix("android.dawn.") }
+ }.map { it.removePrefix("androidx.webgpu.") }
val expected = TYPES_WITH_MAPPED_NAMED_CONSTANTS.mapNotNull { it.simpleName }
@@ -143,7 +143,7 @@
}
private fun isAndroidDawn(clazz: String): Boolean {
- return clazz.startsWith("android.dawn") && clazz.count { it == '.' } == 2
+ return clazz.startsWith("androidx.webgpu") && clazz.count { it == '.' } == 2
}
private fun hasCompanionObjectWithNames(clazz: String): Boolean {
diff --git a/tools/android/webgpu/src/test/java/android/dawn/RoundingTest.kt b/tools/android/webgpu/src/test/java/androidx/webgpu/RoundingTest.kt
similarity index 86%
rename from tools/android/webgpu/src/test/java/android/dawn/RoundingTest.kt
rename to tools/android/webgpu/src/test/java/androidx/webgpu/RoundingTest.kt
index a292eef..576a77a 100644
--- a/tools/android/webgpu/src/test/java/android/dawn/RoundingTest.kt
+++ b/tools/android/webgpu/src/test/java/androidx/webgpu/RoundingTest.kt
@@ -1,7 +1,7 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.roundDownToNearestMultipleOf
-import android.dawn.helper.roundUpToNearestMultipleOf
+import androidx.webgpu.helper.roundDownToNearestMultipleOf
+import androidx.webgpu.helper.roundUpToNearestMultipleOf
import org.junit.Assert
import org.junit.Test
diff --git a/tools/android/webgpu/src/test/java/android/dawn/StructuresTest.kt b/tools/android/webgpu/src/test/java/androidx/webgpu/StructuresTest.kt
similarity index 95%
rename from tools/android/webgpu/src/test/java/android/dawn/StructuresTest.kt
rename to tools/android/webgpu/src/test/java/androidx/webgpu/StructuresTest.kt
index 39e02d9..4d2c094 100644
--- a/tools/android/webgpu/src/test/java/android/dawn/StructuresTest.kt
+++ b/tools/android/webgpu/src/test/java/androidx/webgpu/StructuresTest.kt
@@ -1,4 +1,4 @@
-package android.dawn
+package androidx.webgpu
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/tools/android/webgpu/src/test/java/android/dawn/TexturesTest.kt b/tools/android/webgpu/src/test/java/androidx/webgpu/TexturesTest.kt
similarity index 84%
rename from tools/android/webgpu/src/test/java/android/dawn/TexturesTest.kt
rename to tools/android/webgpu/src/test/java/androidx/webgpu/TexturesTest.kt
index c84675d..d9a13f4 100644
--- a/tools/android/webgpu/src/test/java/android/dawn/TexturesTest.kt
+++ b/tools/android/webgpu/src/test/java/androidx/webgpu/TexturesTest.kt
@@ -1,7 +1,7 @@
-package android.dawn
+package androidx.webgpu
-import android.dawn.helper.DawnException
-import android.dawn.helper.createBitmap
+import androidx.webgpu.helper.DawnException
+import androidx.webgpu.helper.createBitmap
import kotlin.test.assertFailsWith
import kotlinx.coroutines.test.runTest
import org.junit.Test
