Merge "Add scaffolding for 'sdkext' module"
diff --git a/Android.bp b/Android.bp
index d20cd9d..63c8fb6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -267,6 +267,7 @@
     srcs: [
         ":framework-mime-sources",
         ":framework-non-updatable-sources",
+        ":framework-sdkext-sources",
         ":updatable-media-srcs",
     ],
 }
@@ -974,6 +975,7 @@
     srcs: [
         ":framework-non-updatable-sources",
         ":framework-mime-sources",
+        ":framework-sdkext-sources",
         "core/java/**/*.logtags",
         "test-base/src/**/*.java",
         ":opt-telephony-srcs",
@@ -1038,6 +1040,7 @@
     name: "metalava-api-stubs-default",
     srcs: [
         ":framework-non-updatable-sources",
+        ":framework-sdkext-sources",
         "core/java/**/*.logtags",
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
diff --git a/apex/sdkext/OWNERS b/apex/sdkext/OWNERS
new file mode 100644
index 0000000..feb2742
--- /dev/null
+++ b/apex/sdkext/OWNERS
@@ -0,0 +1 @@
+hansson@google.com
diff --git a/apex/sdkext/framework/Android.bp b/apex/sdkext/framework/Android.bp
new file mode 100644
index 0000000..bc7857f
--- /dev/null
+++ b/apex/sdkext/framework/Android.bp
@@ -0,0 +1,21 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+filegroup {
+    name: "framework-sdkext-sources",
+    srcs: [
+        "java/**/*.java",
+    ],
+    path: "java",
+}