From 397aa8f61328976b29adff53839deb8bd4257e78 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 15 Jul 2018 12:10:52 +0100
Subject: use phh manifests, copy instead of checkout for my stuff

---
 build.sh            | 14 ++++++++++++--
 dakkar.xml          |  6 ------
 foss.xml            | 10 ----------
 manifest.xml        | 10 ----------
 manifest/dakkar.xml |  6 ++++++
 opengapps.xml       | 14 --------------
 6 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 dakkar.xml
 delete mode 100644 foss.xml
 delete mode 100644 manifest.xml
 create mode 100644 manifest/dakkar.xml
 delete mode 100644 opengapps.xml

diff --git a/build.sh b/build.sh
index d3fb41b..e808b47 100644
--- a/build.sh
+++ b/build.sh
@@ -28,14 +28,24 @@ function clone_or_checkout() {
 }
 
 function init_repo() {
+    rm -f .repo/local_manifests/
+    rm -f .repo/dakkar-patches/
     repo init -u https://github.com/LineageOS/android.git -b lineage-15.1
 }
 
 function setup_code() {
-    clone_or_checkout .repo/local_manifests "$thisdir" master
-    clone_or_checkout dakkar-patches "$thisdir" master
+    # manifests
+    clone_or_checkout .repo/local_manifests https://github.com/phhusson/treble_manifest master
+
+    cp "$thisdir"/manifest/dakkar.xml .repo/local_manifests/
+    rm -f .repo/local_manifests/replace.xml
+
+    # patches
     clone_or_checkout patches https://github.com/phhusson/treble_patches android-8.1
 
+    mkdir -p dakkar-patches/
+    cp -a "$thisdir"/patches dakkar-patches/
+
     repo sync -c -j$jobs --force-sync
 
     rm -f device/*/sepolicy/common/private/genfs_contexts
diff --git a/dakkar.xml b/dakkar.xml
deleted file mode 100644
index e7c1939..0000000
--- a/dakkar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
- <remote name="dakkar" fetch="https://www.thenautilus.net/cgit/" />
-
- <project path="device/dakkar/" name="dakkar-android-huawei-m5" remote="dakkar" revision="master" />
-</manifest>
diff --git a/foss.xml b/foss.xml
deleted file mode 100644
index b41a571..0000000
--- a/foss.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
-	<remote name="phh" fetch="https://github.com/phhusson/" />
-	<project path="packages/apps/FDroidPrivilegedExtension"
-		name="privileged-extension.git" remote="fdroid"
-		revision="refs/tags/0.2.7" />
-	<project path="vendor/foss" name="vendor_foss"
-		remote="phh" revision="master" />
-</manifest>
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index 10b4deb..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<remote name="phh" fetch="https://github.com/phhusson/" />
-
-<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="master" />
-<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-8.1" />
-<project path="vendor/vndk" name="vendor_vndk" remote="phh" revision="master" />
-<project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phh" revision="master" />
-<project path="vendor/gapps-go" name="gapps-go" remote="phh" revision="master" />
-</manifest>
diff --git a/manifest/dakkar.xml b/manifest/dakkar.xml
new file mode 100644
index 0000000..e7c1939
--- /dev/null
+++ b/manifest/dakkar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+ <remote name="dakkar" fetch="https://www.thenautilus.net/cgit/" />
+
+ <project path="device/dakkar/" name="dakkar-android-huawei-m5" remote="dakkar" revision="master" />
+</manifest>
diff --git a/opengapps.xml b/opengapps.xml
deleted file mode 100644
index 3c608d4..0000000
--- a/opengapps.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-<remote name="opengapps" fetch="https://github.com/opengapps/"  />
-
-<project path="vendor/opengapps/build" name="aosp_build" revision="master" remote="opengapps" />
-<project path="vendor/opengapps/sources/all" name="all" clone-depth="1" revision="master" remote="opengapps" />
-
-<!-- arm64 depends on arm -->
-<project path="vendor/opengapps/sources/arm" name="arm" clone-depth="1" revision="master" remote="opengapps" />
-<project path="vendor/opengapps/sources/arm64" name="arm64" clone-depth="1" revision="master" remote="opengapps" />
-
-<project path="vendor/opengapps/sources/x86" name="x86" clone-depth="1" revision="master" remote="opengapps" />
-<project path="vendor/opengapps/sources/x86_64" name="x86_64" clone-depth="1" revision="master" remote="opengapps" />
-</manifest>
-- 
cgit v1.2.3