summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-21 16:59:57 -0700
committerColin Cross <ccross@android.com>2014-06-04 10:10:01 -0700
commit1fca51c3c40bdcd596d658e69dad92df5c73a9f3 (patch)
tree6431b9aec412053e6ed4d0b6e2b83f74e23fec6b
parent5a852a1a94649f81d53682c3fd247c1a55d7aaf5 (diff)
downloadmanifest-1fca51c3c40bdcd596d658e69dad92df5c73a9f3.tar.gz
DO NOT MERGE: Revert "remove external/libnl-headers from the manifest"
This reverts commit fd1e90b3b1455615ff00c21dc90a0d4bfa21840e. libnl_2 needs to stay in AOSP for now for compatibility with GPL test builds. (cherry picked from commit 65480a071f2f0db010d47535513a98e47477d8d2) Change-Id: Ide26ec95bb606165094890faa7d3aee7490be7f6
-rw-r--r--default.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index fbfd56bc6..39b9fde12 100644
--- a/default.xml
+++ b/default.xml
@@ -168,6 +168,7 @@
<project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="pdk" />
<project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="pdk" />
<project path="external/libnl" name="platform/external/libnl" />
+ <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="pdk" />
<project path="external/libogg" name="platform/external/libogg" />
<project path="external/libpcap" name="platform/external/libpcap" />
<project path="external/libphonenumber" name="platform/external/libphonenumber" />