Separate 1p, 3p, and TV helpers
* Divide folders
Change-Id: I323c3a917bf76431f222cef70771e8294607efc3
diff --git a/libraries/app-helpers/Android.mk b/libraries/first-party-app-helpers/handheld/Android.mk
similarity index 72%
rename from libraries/app-helpers/Android.mk
rename to libraries/first-party-app-helpers/handheld/Android.mk
index 666304c..feee8ea 100644
--- a/libraries/app-helpers/Android.mk
+++ b/libraries/first-party-app-helpers/handheld/Android.mk
@@ -22,20 +22,10 @@
chrome-app-helper play-store-app-helper play-movies-app-helper \
gmail-app-helper maps-app-helper recents-app-helper \
google-keyboard-app-helper google-messenger-app-helper \
- play-books-app-helper google-docs-app-helper
+ play-books-app-helper google-docs-app-helper settings-app-helper
+
include $(BUILD_STATIC_JAVA_LIBRARY)
######################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := third-party-app-helpers
-LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib base-app-helpers facebook-app-helper \
- reddit-app-helper flightdemo-app-helper tunein-app-helper
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-######################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := leanback-app-helpers
-LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib base-app-helpers
-include $(BUILD_STATIC_JAVA_LIBRARY)
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/libraries/chrome-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/chrome-app-helper/Android.mk
similarity index 100%
rename from libraries/chrome-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/chrome-app-helper/Android.mk
diff --git a/libraries/chrome-app-helper/src/android/platform/test/helpers/ChromeHelperImpl.java b/libraries/first-party-app-helpers/handheld/chrome-app-helper/src/android/platform/test/helpers/ChromeHelperImpl.java
similarity index 100%
rename from libraries/chrome-app-helper/src/android/platform/test/helpers/ChromeHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/chrome-app-helper/src/android/platform/test/helpers/ChromeHelperImpl.java
diff --git a/libraries/gmail-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/gmail-app-helper/Android.mk
similarity index 100%
rename from libraries/gmail-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/gmail-app-helper/Android.mk
diff --git a/libraries/gmail-app-helper/src/android/platform/test/helpers/GmailHelperImpl.java b/libraries/first-party-app-helpers/handheld/gmail-app-helper/src/android/platform/test/helpers/GmailHelperImpl.java
similarity index 100%
rename from libraries/gmail-app-helper/src/android/platform/test/helpers/GmailHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/gmail-app-helper/src/android/platform/test/helpers/GmailHelperImpl.java
diff --git a/libraries/google-app-camera-helper/Android.mk b/libraries/first-party-app-helpers/handheld/google-app-camera-helper/Android.mk
similarity index 100%
rename from libraries/google-app-camera-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/google-app-camera-helper/Android.mk
diff --git a/libraries/google-app-camera-helper/src/android/platform/test/helpers/GoogleCameraHelperImpl.java b/libraries/first-party-app-helpers/handheld/google-app-camera-helper/src/android/platform/test/helpers/GoogleCameraHelperImpl.java
similarity index 100%
rename from libraries/google-app-camera-helper/src/android/platform/test/helpers/GoogleCameraHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/google-app-camera-helper/src/android/platform/test/helpers/GoogleCameraHelperImpl.java
diff --git a/libraries/google-docs-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/google-docs-app-helper/Android.mk
similarity index 100%
rename from libraries/google-docs-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/google-docs-app-helper/Android.mk
diff --git a/libraries/google-docs-app-helper/src/android/platform/test/helpers/GoogleDocsHelperImpl.java b/libraries/first-party-app-helpers/handheld/google-docs-app-helper/src/android/platform/test/helpers/GoogleDocsHelperImpl.java
similarity index 100%
rename from libraries/google-docs-app-helper/src/android/platform/test/helpers/GoogleDocsHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/google-docs-app-helper/src/android/platform/test/helpers/GoogleDocsHelperImpl.java
diff --git a/libraries/google-keyboard-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/google-keyboard-app-helper/Android.mk
similarity index 100%
rename from libraries/google-keyboard-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/google-keyboard-app-helper/Android.mk
diff --git a/libraries/google-keyboard-app-helper/src/android/platform/test/helpers/GoogleKeyboardHelperImpl.java b/libraries/first-party-app-helpers/handheld/google-keyboard-app-helper/src/android/platform/test/helpers/GoogleKeyboardHelperImpl.java
similarity index 100%
rename from libraries/google-keyboard-app-helper/src/android/platform/test/helpers/GoogleKeyboardHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/google-keyboard-app-helper/src/android/platform/test/helpers/GoogleKeyboardHelperImpl.java
diff --git a/libraries/google-messenger-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/google-messenger-app-helper/Android.mk
similarity index 100%
rename from libraries/google-messenger-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/google-messenger-app-helper/Android.mk
diff --git a/libraries/google-messenger-app-helper/src/android/platform/test/helpers/GoogleMessengerHelperImpl.java b/libraries/first-party-app-helpers/handheld/google-messenger-app-helper/src/android/platform/test/helpers/GoogleMessengerHelperImpl.java
similarity index 100%
rename from libraries/google-messenger-app-helper/src/android/platform/test/helpers/GoogleMessengerHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/google-messenger-app-helper/src/android/platform/test/helpers/GoogleMessengerHelperImpl.java
diff --git a/libraries/maps-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/maps-app-helper/Android.mk
similarity index 100%
rename from libraries/maps-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/maps-app-helper/Android.mk
diff --git a/libraries/maps-app-helper/src/android/platform/test/helpers/MapsHelperImpl.java b/libraries/first-party-app-helpers/handheld/maps-app-helper/src/android/platform/test/helpers/MapsHelperImpl.java
similarity index 100%
rename from libraries/maps-app-helper/src/android/platform/test/helpers/MapsHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/maps-app-helper/src/android/platform/test/helpers/MapsHelperImpl.java
diff --git a/libraries/photos-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/photos-app-helper/Android.mk
similarity index 100%
rename from libraries/photos-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/photos-app-helper/Android.mk
diff --git a/libraries/photos-app-helper/src/android/platform/test/helpers/PhotosHelperImpl.java b/libraries/first-party-app-helpers/handheld/photos-app-helper/src/android/platform/test/helpers/PhotosHelperImpl.java
similarity index 100%
rename from libraries/photos-app-helper/src/android/platform/test/helpers/PhotosHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/photos-app-helper/src/android/platform/test/helpers/PhotosHelperImpl.java
diff --git a/libraries/play-books-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/play-books-app-helper/Android.mk
similarity index 100%
rename from libraries/play-books-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/play-books-app-helper/Android.mk
diff --git a/libraries/play-books-app-helper/src/android/platform/test/helpers/PlayBooksHelperImpl.java b/libraries/first-party-app-helpers/handheld/play-books-app-helper/src/android/platform/test/helpers/PlayBooksHelperImpl.java
similarity index 100%
rename from libraries/play-books-app-helper/src/android/platform/test/helpers/PlayBooksHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/play-books-app-helper/src/android/platform/test/helpers/PlayBooksHelperImpl.java
diff --git a/libraries/play-movies-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/play-movies-app-helper/Android.mk
similarity index 100%
rename from libraries/play-movies-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/play-movies-app-helper/Android.mk
diff --git a/libraries/play-movies-app-helper/src/android/platform/test/helpers/PlayMoviesHelperImpl.java b/libraries/first-party-app-helpers/handheld/play-movies-app-helper/src/android/platform/test/helpers/PlayMoviesHelperImpl.java
similarity index 100%
rename from libraries/play-movies-app-helper/src/android/platform/test/helpers/PlayMoviesHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/play-movies-app-helper/src/android/platform/test/helpers/PlayMoviesHelperImpl.java
diff --git a/libraries/play-music-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/play-music-app-helper/Android.mk
similarity index 100%
rename from libraries/play-music-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/play-music-app-helper/Android.mk
diff --git a/libraries/play-music-app-helper/src/android/platform/test/helpers/PlayMusicHelperImpl.java b/libraries/first-party-app-helpers/handheld/play-music-app-helper/src/android/platform/test/helpers/PlayMusicHelperImpl.java
similarity index 100%
rename from libraries/play-music-app-helper/src/android/platform/test/helpers/PlayMusicHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/play-music-app-helper/src/android/platform/test/helpers/PlayMusicHelperImpl.java
diff --git a/libraries/play-store-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/play-store-app-helper/Android.mk
similarity index 100%
rename from libraries/play-store-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/play-store-app-helper/Android.mk
diff --git a/libraries/play-store-app-helper/src/android/platform/test/helpers/PlayStoreHelperImpl.java b/libraries/first-party-app-helpers/handheld/play-store-app-helper/src/android/platform/test/helpers/PlayStoreHelperImpl.java
similarity index 100%
rename from libraries/play-store-app-helper/src/android/platform/test/helpers/PlayStoreHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/play-store-app-helper/src/android/platform/test/helpers/PlayStoreHelperImpl.java
diff --git a/libraries/recents-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/recents-app-helper/Android.mk
similarity index 100%
rename from libraries/recents-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/recents-app-helper/Android.mk
diff --git a/libraries/recents-app-helper/src/android/platform/test/helpers/RecentsHelperImpl.java b/libraries/first-party-app-helpers/handheld/recents-app-helper/src/android/platform/test/helpers/RecentsHelperImpl.java
similarity index 100%
rename from libraries/recents-app-helper/src/android/platform/test/helpers/RecentsHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/recents-app-helper/src/android/platform/test/helpers/RecentsHelperImpl.java
diff --git a/libraries/settings-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/settings-app-helper/Android.mk
similarity index 100%
rename from libraries/settings-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/settings-app-helper/Android.mk
diff --git a/libraries/settings-app-helper/src/android/platform/test/helpers/SettingsHelperImpl.java b/libraries/first-party-app-helpers/handheld/settings-app-helper/src/android/platform/test/helpers/SettingsHelperImpl.java
similarity index 100%
rename from libraries/settings-app-helper/src/android/platform/test/helpers/SettingsHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/settings-app-helper/src/android/platform/test/helpers/SettingsHelperImpl.java
diff --git a/libraries/youtube-app-helper/Android.mk b/libraries/first-party-app-helpers/handheld/youtube-app-helper/Android.mk
similarity index 100%
rename from libraries/youtube-app-helper/Android.mk
rename to libraries/first-party-app-helpers/handheld/youtube-app-helper/Android.mk
diff --git a/libraries/youtube-app-helper/src/android/platform/test/helpers/YouTubeHelperImpl.java b/libraries/first-party-app-helpers/handheld/youtube-app-helper/src/android/platform/test/helpers/YouTubeHelperImpl.java
similarity index 100%
rename from libraries/youtube-app-helper/src/android/platform/test/helpers/YouTubeHelperImpl.java
rename to libraries/first-party-app-helpers/handheld/youtube-app-helper/src/android/platform/test/helpers/YouTubeHelperImpl.java
diff --git a/libraries/first-party-app-helpers/tv/Android.mk b/libraries/first-party-app-helpers/tv/Android.mk
new file mode 100644
index 0000000..9e0b7dd
--- /dev/null
+++ b/libraries/first-party-app-helpers/tv/Android.mk
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2016 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.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := leanback-app-helpers
+LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib base-app-helpers
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+######################################
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/libraries/third-party-app-helpers/Android.mk b/libraries/third-party-app-helpers/Android.mk
new file mode 100644
index 0000000..91134e6
--- /dev/null
+++ b/libraries/third-party-app-helpers/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2016 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.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := third-party-app-helpers
+LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib base-app-helpers facebook-app-helper \
+ reddit-app-helper flightdemo-app-helper tunein-app-helper
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+######################################
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/libraries/facebook-app-helper/Android.mk b/libraries/third-party-app-helpers/facebook-app-helper/Android.mk
similarity index 100%
rename from libraries/facebook-app-helper/Android.mk
rename to libraries/third-party-app-helpers/facebook-app-helper/Android.mk
diff --git a/libraries/facebook-app-helper/src/android/platform/test/helpers/FacebookHelperImpl.java b/libraries/third-party-app-helpers/facebook-app-helper/src/android/platform/test/helpers/FacebookHelperImpl.java
similarity index 100%
rename from libraries/facebook-app-helper/src/android/platform/test/helpers/FacebookHelperImpl.java
rename to libraries/third-party-app-helpers/facebook-app-helper/src/android/platform/test/helpers/FacebookHelperImpl.java
diff --git a/libraries/flightdemo-app-helper/Android.mk b/libraries/third-party-app-helpers/flightdemo-app-helper/Android.mk
similarity index 100%
rename from libraries/flightdemo-app-helper/Android.mk
rename to libraries/third-party-app-helpers/flightdemo-app-helper/Android.mk
diff --git a/libraries/flightdemo-app-helper/src/android/platform/test/helpers/FlightDemoHelperImpl.java b/libraries/third-party-app-helpers/flightdemo-app-helper/src/android/platform/test/helpers/FlightDemoHelperImpl.java
similarity index 100%
rename from libraries/flightdemo-app-helper/src/android/platform/test/helpers/FlightDemoHelperImpl.java
rename to libraries/third-party-app-helpers/flightdemo-app-helper/src/android/platform/test/helpers/FlightDemoHelperImpl.java
diff --git a/libraries/reddit-app-helper/Android.mk b/libraries/third-party-app-helpers/reddit-app-helper/Android.mk
similarity index 100%
rename from libraries/reddit-app-helper/Android.mk
rename to libraries/third-party-app-helpers/reddit-app-helper/Android.mk
diff --git a/libraries/reddit-app-helper/src/android/platform/test/helpers/RedditHelperImpl.java b/libraries/third-party-app-helpers/reddit-app-helper/src/android/platform/test/helpers/RedditHelperImpl.java
similarity index 100%
rename from libraries/reddit-app-helper/src/android/platform/test/helpers/RedditHelperImpl.java
rename to libraries/third-party-app-helpers/reddit-app-helper/src/android/platform/test/helpers/RedditHelperImpl.java
diff --git a/libraries/tunein-app-helper/Android.mk b/libraries/third-party-app-helpers/tunein-app-helper/Android.mk
similarity index 100%
rename from libraries/tunein-app-helper/Android.mk
rename to libraries/third-party-app-helpers/tunein-app-helper/Android.mk
diff --git a/libraries/tunein-app-helper/src/android/platform/test/helpers/TuneInHelperImpl.java b/libraries/third-party-app-helpers/tunein-app-helper/src/android/platform/test/helpers/TuneInHelperImpl.java
similarity index 100%
rename from libraries/tunein-app-helper/src/android/platform/test/helpers/TuneInHelperImpl.java
rename to libraries/third-party-app-helpers/tunein-app-helper/src/android/platform/test/helpers/TuneInHelperImpl.java
