diff --git a/packages/analytics/amplify_analytics_pinpoint/.metadata b/packages/analytics/amplify_analytics_pinpoint/.metadata
new file mode 100644
index 0000000000..c519b0887d
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/.metadata
@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled.
+
+version:
+ revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ channel: stable
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+ platforms:
+ - platform: root
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: android
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: ios
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: linux
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: macos
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: web
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ - platform: windows
+ create_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+ base_revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+
+ # User provided section
+
+ # List of Local paths (relative to this file) that should be
+ # ignored by the migrate tool.
+ #
+ # Files that are not part of the templates will be ignored by default.
+ unmanaged_files:
+ - 'lib/main.dart'
+ - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/packages/analytics/amplify_analytics_pinpoint/Makefile b/packages/analytics/amplify_analytics_pinpoint/Makefile
new file mode 100644
index 0000000000..ab34e2e8cb
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/Makefile
@@ -0,0 +1,4 @@
+.PHONY: pigeons
+pigeons:
+ flutter pub run pigeon --input pigeons/pigeon_config_android.dart
+ flutter format --fix lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
\ No newline at end of file
diff --git a/packages/analytics/amplify_analytics_pinpoint/analysis_options.yaml b/packages/analytics/amplify_analytics_pinpoint/analysis_options.yaml
index eb7b6bab52..a806cb6753 100644
--- a/packages/analytics/amplify_analytics_pinpoint/analysis_options.yaml
+++ b/packages/analytics/amplify_analytics_pinpoint/analysis_options.yaml
@@ -1,5 +1,7 @@
include: package:amplify_lints/library.yaml
-analyzer:
+analyzer:
errors:
- implementation_imports: error #TODO(equartey): Remove when lint is enforced project-wide
+ implementation_imports: error #TODO(equartey): Remove when lint is enforced project-wide
+ exclude:
+ - "**/*.g.dart"
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/.gitignore b/packages/analytics/amplify_analytics_pinpoint/android/.gitignore
new file mode 100644
index 0000000000..26659750ab
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/android/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
\ No newline at end of file
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/build.gradle b/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
new file mode 100644
index 0000000000..ff76d95f44
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
@@ -0,0 +1,51 @@
+group 'com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint'
+version '1.0-SNAPSHOT'
+
+buildscript {
+ ext.kotlin_version = '1.6.10'
+ repositories {
+ google()
+ mavenCentral()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:7.1.3'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ }
+}
+
+rootProject.allprojects {
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+ compileSdkVersion 33
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
+
+ sourceSets {
+ main.java.srcDirs += 'src/main/kotlin'
+ }
+
+ defaultConfig {
+ minSdkVersion 23
+ }
+}
+
+dependencies {
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle b/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle
new file mode 100644
index 0000000000..828ffda158
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'amplify_analytics_pinpoint'
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/AndroidManifest.xml b/packages/analytics/amplify_analytics_pinpoint/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..178b72183e
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+
+
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java
new file mode 100644
index 0000000000..cebacf407c
--- /dev/null
+++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java
@@ -0,0 +1,85 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+// Autogenerated from Pigeon (v4.2.14), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+
+package com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import io.flutter.plugin.common.BasicMessageChannel;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MessageCodec;
+import io.flutter.plugin.common.StandardMessageCodec;
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/** Generated class from Pigeon. */
+@SuppressWarnings({"unused", "unchecked", "CodeBlock2Expr", "RedundantSuppression"})
+public class Messages {
+
+ public interface Result {
+ void success(T result);
+ void error(Throwable error);
+ }
+ /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
+ public interface PigeonLegacyDataProvider {
+ void getEndpointId(@NonNull String pinpointAppId, Result result);
+
+ /** The codec used by PigeonLegacyDataProvider. */
+ static MessageCodec