Merge "Retire the emulator workaround"
diff --git a/liblog/include/android/log.h b/liblog/include/android/log.h
index 8a0ebf2..5dc365a 100644
--- a/liblog/include/android/log.h
+++ b/liblog/include/android/log.h
@@ -217,7 +217,6 @@
*/
typedef void (*__android_aborter_function)(const char* abort_message);
-#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
/**
* Writes the log message specified by log_message. log_message includes additional file name and
* line number information that a logger may use. log_message is versioned for backwards
@@ -371,7 +370,6 @@
* Available since API level 30.
*/
void __android_log_set_default_tag(const char* tag) __INTRODUCED_IN(30);
-#endif
#ifdef __cplusplus
}
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index 735fd94..b835bd5 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -143,8 +143,8 @@
pclose(fp);
- // logcat, liblogcat and logcatd test instances result in the progression
- // of 3, 6 and 9 for our counts as each round is performed.
+ // logcat and logcatd test instances result in the progression
+ // of 3, 6, and 9 for our counts as each round is performed.
EXPECT_GE(count, 3);
EXPECT_LE(count, 9);
EXPECT_EQ(count % 3, 0);
@@ -1673,7 +1673,7 @@
EXPECT_GT(logcatHelpTextSize, 4096UL);
size_t logcatLastHelpTextSize =
commandOutputSize(logcat_executable " -L -h 2>&1");
-#ifdef USING_LOGCAT_EXECUTABLE_DEFAULT // logcat and liblogcat
+#ifdef USING_LOGCAT_EXECUTABLE_DEFAULT
EXPECT_EQ(logcatHelpTextSize, logcatLastHelpTextSize);
#else
// logcatd -L -h prints the help twice, as designed.
