[PATCH] SE Android local manifest patch dalvik and lobcore

[PATCH] SE Android local manifest patch dalvik and lobcore

[William Roberts]

[-- Attachment #1.1: Type: text/plain, Size: 552 bytes --]

If your getting errors on sync that are about dalvik and libcore not being
found, this patch may help.

AOSP updated their references for dalvik and libcore to snapshots and named
them dalvik2 and libcore2.

remove project was failing in local_manifest for master. Not sure about
other branches.

This patch resolves this, not sure if this is the best approach, but this
patch will help in the interim.

make sure you get your local_manifest's from git:
git clone git://git.selinuxproject.org/~seandroid/manifests

-- 
Respectfully,

William C Roberts

[-- Attachment #1.2: Type: text/html, Size: 805 bytes --]

[-- Attachment #2: manifest.patch --]
[-- Type: application/octet-stream, Size: 2005 bytes --]

diff --git a/local_manifest.xml b/local_manifest.xml
index 984ce22..6041cd4 100644
--- a/local_manifest.xml
+++ b/local_manifest.xml
@@ -22,10 +22,10 @@
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <remove-project name="platform/dalvik"/>
+  <remove-project name="platform/dalvik2"/>
   <project path="dalvik" remote="selinuxproject" name="platform/dalvik" revision="seandroid" />
 
-  <remove-project name="platform/libcore"/>
+  <remove-project name="platform/libcore2"/>
   <project path="libcore" remote="selinuxproject" name="platform/libcore" revision="seandroid" />
 
   <remove-project name="platform/frameworks/base"/>
diff --git a/local_manifest_http.xml b/local_manifest_http.xml
index 163fcad..ae6637c 100644
--- a/local_manifest_http.xml
+++ b/local_manifest_http.xml
@@ -22,10 +22,10 @@
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <remove-project name="platform/dalvik"/>
+  <remove-project name="platform/dalvik2"/>
   <project path="dalvik" remote="selinuxproject" name="platform/dalvik" revision="seandroid" />
 
-  <remove-project name="platform/libcore"/>
+  <remove-project name="platform/libcore2"/>
   <project path="libcore" remote="selinuxproject" name="platform/libcore" revision="seandroid" />
 
   <remove-project name="platform/frameworks/base"/>
diff --git a/local_manifest_mmac.xml b/local_manifest_mmac.xml
index 2a8154e..9168d89 100644
--- a/local_manifest_mmac.xml
+++ b/local_manifest_mmac.xml
@@ -23,10 +23,10 @@
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <remove-project name="platform/dalvik"/>
+  <remove-project name="platform/dalvik2"/>
   <project path="dalvik" remote="selinuxproject" name="platform/dalvik" revision="seandroid" />
 
-  <remove-project name="platform/libcore"/>
+  <remove-project name="platform/libcore2"/>
   <project path="libcore" remote="selinuxproject" name="platform/libcore" revision="seandroid" />
 
   <remove-project name="platform/frameworks/base"/>

Re: [PATCH] SE Android local manifest patch dalvik and lobcore

[Stephen Smalley]

On Thu, 2012-06-21 at 14:19 -0700, William Roberts wrote:
> If your getting errors on sync that are about dalvik and libcore not
> being found, this patch may help.
> 
> 
> AOSP updated their references for dalvik and libcore to snapshots and
> named them dalvik2 and libcore2.
> 
> 
> remove project was failing in local_manifest for master. Not sure
> about other branches.
> 
> 
> This patch resolves this, not sure if this is the best approach, but
> this patch will help in the interim. 
> 
> 
> make sure you get your local_manifest's from git:
> git clone git://git.selinuxproject.org/~seandroid/manifests

I changed the local manifest files for master to drop dalvik and libcore
altogether, as our changes are now present in AOSP master.


-- 
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.