Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove broken support for repo and Android.mk

Browse Source 
* The repo instructions are just a duplicate of the simple git submodules
* The Android.mk build instructions don't work and will never support what
  e.g. gradle does

Anyone wanting to bundle F-Droid in a ROM can build it with git and gradle,
and then including the resulting apk.
This commit is contained in:
Daniel Martí 2014-05-20 18:39:26 +02:00
parent 67c7c9b8b5
commit 0f98042520
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Android.mk
View File

@ -1,23 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := F-Droid
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-java-files-under, extern/MemorizingTrustManager/src) \
$(call all-java-files-under, extern/AndroidPinning/src) \
$(call all-java-files-under, extern/UniversalImageLoader/library/src )
res_dirs = res extern/MemorizingTrustManager/res extern/AndroidPinning/res
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages org.fdroid.fdroid:de.duenndns.ssl:org.thoughtcrime.ssl.pinning
LOCAL_PRIVILEGED_MODULE := true
include $(BUILD_PACKAGE)

18
README.md
View File

@ -22,24 +22,6 @@ The project itself supports Gradle, but some of the libraries it uses don't.
Hence it is currently not possible to build F-Droid with Gradle in a clean way
without manual interaction.
Building as part of a ROM
-------------------------
Add the following lines to your repo manifest:
```
<remote name="fdroid" fetch="https://git.gitorious.org/f-droid" />
<remote name="github" fetch="https://github.com/" />
<project path="packages/apps/fdroidclient" name="fdroidclient.git" remote="fdroid" revision="0.66" />
<project path="packages/apps/fdroidclient/extern/UniversalImageLoader" name="nostra13/Android-Universal-Image-Loader" remote="github" revision="ee50fd1ce77d866a89374a5ff0886be6e179feb2" />
<project path="packages/apps/fdroidclient/extern/AndroidPinning" name="binaryparadox/AndroidPinning" remote="github" revision="a0d713c6162b7016a3c3f55bcaefcdca4acacebd" />
<project path="packages/apps/fdroidclient/extern/MemorizingTrustManager" name="ge0rg/MemorizingTrustManager" remote="github" revision="a705441ac53b9e1aba9f00f3f59aab81da6fbc9e" />
```
Adding F-Droid is then just a matter of adding `F-Droid` to your `PRODUCT_PACKAGES`.
Direct download
---------------

10
tools/repo-revisions.sh
View File

@ -1,10 +0,0 @@
#!/bin/bash -ex
# Update README repo manifest revisions from git
#LAST_STABLE_TAG=$(git describe --abbrev=0 --tags --match='[0-9]*[0-9]')
#sed -i 's@\(.*name="fdroidclient\.git".*revision="\)[^"]*\(".*\)@\1'$LAST_STABLE_TAG'\2@' README.md
git ls-tree HEAD extern/ | while read _ _ revision path; do
sed -i 's@\(.*fdroidclient/'$path'".*revision="\)[^"]*\(".*\)@\1'$revision'\2@' README.md
done