diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-02 14:37:05 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-11-03 14:32:00 -0800 |
| commit | 3165525126d45b35934bde146b047ccecebac860 (patch) | |
| tree | dbedab3496bd1645c5c68da959a65e8ba5a81588 /sources | |
| parent | d2e26a00ef36743d5b2eedeb0f03bcba0843bf9f (diff) | |
| download | ndk-3165525126d45b35934bde146b047ccecebac860.tar.gz | |
Include a repo.prop in each package.
This doesn't cover any packages that are built from toolchain or that
are installed to prebuilt/$HOST_TAG. The former will be fixed in
another patch soon, but the latter is going to take some
reorganization because several packages install to the same directory
(and the repo.prop files will clobber each other).
We need to also add the repo.prop files to each STL's .gitignore
because the STLs are still building into their source directory ಠ_ಠ
Bug: http://b/25417748
Change-Id: I4a666efecde192a5674e4c8b8ad835ceef80dd09
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/cxx-stl/gnu-libstdc++/.gitignore | 1 | ||||
| -rwxr-xr-x | sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh | 3 | ||||
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/.gitignore | 1 | ||||
| -rw-r--r-- | sources/cxx-stl/stlport/.gitignore | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/sources/cxx-stl/gnu-libstdc++/.gitignore b/sources/cxx-stl/gnu-libstdc++/.gitignore index f266b97ba..7d54aaee8 100644 --- a/sources/cxx-stl/gnu-libstdc++/.gitignore +++ b/sources/cxx-stl/gnu-libstdc++/.gitignore @@ -3,3 +3,4 @@ # in our git repository. libs/ include/ +/repo.prop diff --git a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh index 0e356e514..c0846943b 100755 --- a/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh +++ b/sources/cxx-stl/gnu-libstdc++/build-gnu-libstdc++.sh @@ -461,6 +461,9 @@ if [ -n "$PACKAGE_DIR" ] ; then done done + make_repo_prop "$NDK_DIR/$GNUSTL_SUBDIR" + FILES="$FILES $GNUSTL_SUBDIR/repo.prop" + PACKAGE="$PACKAGE_DIR/gnustl-${VERSION}.tar.bz2" dump "Packaging: $PACKAGE" pack_archive "$PACKAGE" "$NDK_DIR" "$FILES" diff --git a/sources/cxx-stl/llvm-libc++/.gitignore b/sources/cxx-stl/llvm-libc++/.gitignore index 2fd4c3b35..1b7688f9d 100644 --- a/sources/cxx-stl/llvm-libc++/.gitignore +++ b/sources/cxx-stl/llvm-libc++/.gitignore @@ -1 +1,2 @@ libs/ +/repo.prop diff --git a/sources/cxx-stl/stlport/.gitignore b/sources/cxx-stl/stlport/.gitignore index 2fd4c3b35..1b7688f9d 100644 --- a/sources/cxx-stl/stlport/.gitignore +++ b/sources/cxx-stl/stlport/.gitignore @@ -1 +1,2 @@ libs/ +/repo.prop |