diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-03 01:35:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-03 01:35:03 +0000 |
| commit | 26e1763a1538f7a11e7ba305464543077cfb0b30 (patch) | |
| tree | f4fe842cbe105849052ce8e3e3e64fb5bf4c3349 /examples/Makefile.in | |
| parent | 7b70ff883077fca4d413d363b9d408caa5189889 (diff) | |
| parent | 15be57516e7b4e1751804b4e2d23f71fc781767a (diff) | |
| download | expat-26e1763a1538f7a11e7ba305464543077cfb0b30.tar.gz | |
Merge "Upgrade expat to R_2_3_0" am: e72d9b81bb am: 1b8ae6d364 am: 197794559f am: 15be57516eandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1662879
Change-Id: I391e6319cc621f37044841b89c57d58f7f8c77d3
Diffstat (limited to 'examples/Makefile.in')
| -rw-r--r-- | examples/Makefile.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in index 7c4a296b..513d5efa 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -231,7 +231,6 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -249,6 +248,13 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXPAT_ATTR_INFO = @EXPAT_ATTR_INFO@ +EXPAT_CHAR_TYPE = @EXPAT_CHAR_TYPE@ +EXPAT_CONTEXT_BYTES = @EXPAT_CONTEXT_BYTES@ +EXPAT_DTD = @EXPAT_DTD@ +EXPAT_LARGE_SIZE = @EXPAT_LARGE_SIZE@ +EXPAT_MIN_SIZE = @EXPAT_MIN_SIZE@ +EXPAT_NS = @EXPAT_NS@ FGREP = @FGREP@ FILEMAP = @FILEMAP@ GREP = @GREP@ @@ -261,6 +267,7 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAGE = @LIBAGE@ LIBCURRENT = @LIBCURRENT@ +LIBDIR_BASENAME = @LIBDIR_BASENAME@ LIBOBJS = @LIBOBJS@ LIBREVISION = @LIBREVISION@ LIBS = @LIBS@ @@ -290,6 +297,9 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SO_MAJOR = @SO_MAJOR@ +SO_MINOR = @SO_MINOR@ +SO_PATCH = @SO_PATCH@ STRIP = @STRIP@ VERSION = @VERSION@ _EXPAT_OUTPUT_NAME = @_EXPAT_OUTPUT_NAME@ |