Merge "Remove HAVE_DIRENT_D_TYPE."

core/combo/include/arch/darwin-x86/AndroidConfig.h

@@ -114,11 +114,6 @@
  */
 /* #define HAVE_MALLOC_H */
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if we have madvise() in <sys/mman.h>
  */

core/combo/include/arch/linux-arm/AndroidConfig.h

@@ -125,11 +125,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if libc includes Android system properties implementation.
  */

core/combo/include/arch/linux-arm64/AndroidConfig.h

@@ -123,11 +123,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if libc includes Android system properties implementation.
  */

core/combo/include/arch/linux-mips/AndroidConfig.h

@@ -165,11 +165,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if libc includes Android system properties implementation.
  */

core/combo/include/arch/linux-mips64/AndroidConfig.h

@@ -155,11 +155,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if libc includes Android system properties implementation.
  */

core/combo/include/arch/linux-x86/AndroidConfig.h

@@ -121,11 +121,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if system provides a system property server (should be
  * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).

core/combo/include/arch/target_linux-x86/AndroidConfig.h

@@ -117,11 +117,6 @@
  */
 #define HAVE_MADVISE 1
 
-/*
- * Define if dirent struct has d_type field
- */
-#define HAVE_DIRENT_D_TYPE 1
-
 /*
  * Define if libc includes Android system properties implementation.
  */

tools/atree/files.cpp

@@ -447,14 +447,7 @@ list_dir(const string& path, const FileRecord& rec,
             continue;
         }
         string entry = path_append(path, ent->d_name);
-#ifdef HAVE_DIRENT_D_TYPE
+        bool is_directory = (ent->d_type == DT_DIR);
-		bool is_directory = (ent->d_type == DT_DIR);
-#else
-	    // If dirent.d_type is missing, then use stat instead
-		struct stat stat_buf;
-		stat(entry.c_str(), &stat_buf);
-		bool is_directory = S_ISDIR(stat_buf.st_mode);
-#endif
         add_more(entry, is_directory, rec, more);
         if (is_directory) {
             dirs.push_back(entry);

tools/atree/fs.cpp

@@ -63,14 +63,7 @@ remove_recursively(const string& path)
             string full = path;
             full += '/';
             full += ent->d_name;
-#ifdef HAVE_DIRENT_D_TYPE
             bool is_directory = (ent->d_type == DT_DIR);
-#else
-            // If dirent.d_type is missing, then use stat instead
-            struct stat stat_buf;
-            stat(full.c_str(), &stat_buf);
-            bool is_directory = S_ISDIR(stat_buf.st_mode);
-#endif
             if (is_directory) {
                 dirs.push_back(full);
             } else {