diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-07-08 19:11:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-08 19:11:04 +0000 |
commit | 26bb352ae076029d59c82610e8c77c842f33ac41 (patch) | |
tree | 788f7d155be3e72618dc0bd31a7b86d40e0dc46e | |
parent | 3965507116bd60598dccb3ef730a5350af2002c3 (diff) | |
parent | 5d4c86892885ae1bc12e0e157b35ef44e8ba81bd (diff) | |
download | platform_external_iproute2-lollipop-dev.tar.gz platform_external_iproute2-lollipop-dev.tar.bz2 platform_external_iproute2-lollipop-dev.zip |
am 5d4c8689: Merge "Define a writeable CONFDIR for iproute2."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit '5d4c86892885ae1bc12e0e157b35ef44e8ba81bd':
Define a writeable CONFDIR for iproute2.
-rw-r--r-- | lib/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index 38013356..a856eaeb 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE := libiprouteutil LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include LOCAL_CFLAGS := -O2 -g -W -Wall \ + -DCONFDIR=\"/data/misc/net\" \ -DHAVE_UNISTD_H \ -DHAVE_ERRNO_H \ -DHAVE_NETINET_IN_H \ |