diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-10-22 13:49:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-10-30 21:57:08 +0000 |
| commit | 0aa655892286defb098d3eef7be19da59bcd3f32 (patch) | |
| tree | a01b8a7b0e6829dc74a77c733977c7711687b008 | |
| parent | 8352d7a311ae3f7838cc9d9ee0d69625f73b89e6 (diff) | |
| download | mdnsresponder-marshmallow-dr-dragon-release.tar.gz | |
Stop building __DATE__/__TIME__ into Android binariesandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r63android-6.0.1_r62android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r5android-6.0.1_r45android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r18android-6.0.1_r16marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-dragon-release
Since every build of this library will be different due to using
__DATE__/__TIME__, every OTA will need to patch these files.
Bug: 24204119
Change-Id: I27485995147c8fdda33f4e1c766cdc67732c653a
(cherry picked from commit 362e08783425519a06da07221ca6083a5944ed62)
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | Clients/dns-sd.c | 2 | ||||
| -rw-r--r-- | mDNSShared/dnssd_clientlib.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -53,7 +53,7 @@ LOCAL_C_INCLUDES := external/mdnsresponder/mDNSPosix \ external/mdnsresponder/mDNSCore \ external/mdnsresponder/mDNSShared -LOCAL_CFLAGS := $(commonFlags) +LOCAL_CFLAGS := $(commonFlags) -DMDNS_VERSIONSTR_NODTS=1 LOCAL_STATIC_LIBRARIES := $(commonLibs) libc LOCAL_FORCE_STATIC_EXECUTABLE := true diff --git a/Clients/dns-sd.c b/Clients/dns-sd.c index c73c221..c5a09ff 100644 --- a/Clients/dns-sd.c +++ b/Clients/dns-sd.c @@ -1338,9 +1338,11 @@ Fail: #define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) #s #define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) +#ifndef __ANDROID__ // NOT static -- otherwise the compiler may optimize it out // The "@(#) " pattern is a special prefix the "what" command looks for const char VersionString_SCCS[] = "@(#) dns-sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")"; +#endif #if _BUILDING_XCODE_PROJECT_ // If the process crashes, then this string will be magically included in the automatically-generated crash log diff --git a/mDNSShared/dnssd_clientlib.c b/mDNSShared/dnssd_clientlib.c index c3a3cfc..a92c0c8 100644 --- a/mDNSShared/dnssd_clientlib.c +++ b/mDNSShared/dnssd_clientlib.c @@ -363,4 +363,6 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex // NOT static -- otherwise the compiler may optimize it out // The "@(#) " pattern is a special prefix the "what" command looks for +#ifndef __ANDROID__ const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")"; +#endif |