From 5bf123a9fd22dca21966f5ad6ce8843dde3d5b5d Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Tue, 24 May 2016 11:19:28 +0800
Subject: [PATCH 1/2] Support for FriendlyARM NanoPi 3

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 default.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default.xml b/default.xml
index e2a4b8e..7d8aa5c 100644
--- a/default.xml
+++ b/default.xml
@@ -62,6 +62,7 @@
   <project path="device/sample" name="device/sample" groups="pdk" />
   <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" />
   <project path="device/friendly-arm/nanopi2" name="android_device_friendly-arm_nanopi2" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" groups="device,nanopi2" />
+  <project path="device/friendly-arm/nanopi3" name="android_device_friendly-arm_nanopi3" remote="origin" revision="refs/heads/nanopi3-lollipop-mr1" groups="device,nanopi3" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="pdk-cw-fs" />
   <project path="external/aac" name="platform/external/aac" groups="pdk" />
   <project path="external/android-clat" name="platform/external/android-clat" groups="pdk-cw-fs" />
@@ -520,8 +521,10 @@
   <project path="vendor/broadcom/nanopi2" name="android_vendor_broadcom_nanopi2" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" />
   <project path="vendor/friendly-arm/build" name="android_vendor_friendly-arm_build" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" groups="nanopi2" />
   <project path="vendor/friendly-arm/nanopi2" name="android_vendor_friendly-arm_nanopi2" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" groups="nanopi2" />
+  <project path="vendor/friendly-arm/nanopi3" name="android_vendor_friendly-arm_nanopi3" remote="origin" revision="refs/heads/nanopi3-lollipop-mr1" groups="nanopi3" />
   <project path="vendor/friendly-arm/apps" name="android_vendor_friendly-arm_apps" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" />
   <project path="vendor/nexell/s5p4418" name="nexell_platform_s5p4418" remote="origin" revision="refs/heads/nanopi2-lollipop-mr1" />
+  <project path="vendor/nexell/s5p6818" name="nexell_platform_s5p6818" remote="origin" revision="refs/heads/nanopi3-lollipop-mr1" />
   <project path="vendor/nexell/apps" name="android_vendor_nexell_apps" remote="origin" />
 
 </manifest>

From 29887fb210361843bf0582858042d06c9d4965d8 Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Wed, 31 Aug 2016 16:18:36 +0800
Subject: [PATCH 2/2] Add packages/apps/Camera2

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 7d8aa5c..d85df5a 100644
--- a/default.xml
+++ b/default.xml
@@ -376,7 +376,7 @@
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
-  <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" />
+  <project path="packages/apps/Camera2" name="android_packages_apps_Camera2" remote="origin" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />