ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using __STRING unnecessarily.

Browse source 
Bug: N/A
Test: builds
Change-Id: I8748abf834ec3a808eb2fc6ee0f288562fb0b4ea
This commit is contained in:
Elliott Hughes 2018-11-14 14:22:12 -08:00
parent e77298ce9f
commit da94ca4d28
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
logcat/tests/logcat_test.cpp
View file

@ -1404,7 +1404,7 @@ TEST(logcat, regex) {
int count = 0;
char buffer[BIG_BUFFER];
#define logcat_regex_prefix ___STRING(logcat) "_test"
#define logcat_regex_prefix logcat_executable "_test"
snprintf(buffer, sizeof(buffer),
logcat_executable " --pid %d -d -e " logcat_regex_prefix "_a+b",
@ -1550,7 +1550,7 @@ TEST(logcat, descriptive) {
{
static const struct tag sync = { 2720, "sync" };
static const char id[] = ___STRING(logcat) ".descriptive-sync";
static const char id[] = logcat_executable ".descriptive-sync";
{
android_log_event_list ctx(sync.tagNo);
ctx << id << (int32_t)42 << (int32_t)-1 << (int32_t)0;
@ -1665,7 +1665,7 @@ TEST(logcat, descriptive) {
// Invent new entries because existing can not serve
EventTagMap* map = android_openEventTagMap(nullptr);
ASSERT_TRUE(nullptr != map);
static const char name[] = ___STRING(logcat) ".descriptive-monotonic";
static const char name[] = logcat_executable ".descriptive-monotonic";
int myTag = android_lookupEventTagNum(map, name, "(new|1|s)",
ANDROID_LOG_UNKNOWN);
android_closeEventTagMap(map);