Merge "Improve error message for failing tests" into sc-dev
diff --git a/README.md b/README.md
index 389d985..45862a2 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
### Deriving extension SDK level
`derive_sdk` is a program that reads metadata stored in other apex modules, in
-the form of binary protobuf files in subpath `etc/sdkinfo.binarypb` inside each
+the form of binary protobuf files in subpath `etc/sdkinfo.pb` inside each
apex. The structure of this protobuf can be seen [here][sdkinfo-proto]. The
exact steps for converting a set of metadata files to actual extension versions
is likely to change over time, and should not be depended upon.
diff --git a/derive_sdk/derive_sdk.cpp b/derive_sdk/derive_sdk.cpp
index 839cc30..80b33dc 100644
--- a/derive_sdk/derive_sdk.cpp
+++ b/derive_sdk/derive_sdk.cpp
@@ -109,8 +109,7 @@
bool SetSdkLevels(const std::string& mountpath) {
ExtensionDatabase db;
- if (!ReadDatabase(
- mountpath + "/com.android.sdkext/etc/extensions_db.binarypb", db)) {
+ if (!ReadDatabase(mountpath + "/com.android.sdkext/etc/extensions_db.pb", db)) {
LOG(ERROR) << "Failed to read database";
return false;
}
@@ -128,7 +127,7 @@
// Skip <name>@<ver> dirs, as they are bind-mounted to <name>
continue;
}
- std::string path = mountpath + "/" + name + "/etc/sdkinfo.binarypb";
+ std::string path = mountpath + "/" + name + "/etc/sdkinfo.pb";
struct stat statbuf;
if (stat(path.c_str(), &statbuf) != 0) {
continue;
diff --git a/derive_sdk/derive_sdk_test.cpp b/derive_sdk/derive_sdk_test.cpp
index 8507b5f..70d7dff 100644
--- a/derive_sdk/derive_sdk_test.cpp
+++ b/derive_sdk/derive_sdk_test.cpp
@@ -50,7 +50,7 @@
req->set_module(pair.first);
req->mutable_version()->set_version(pair.second);
}
- WriteProto(db_, EtcDir("com.android.sdkext") + "/extensions_db.binarypb");
+ WriteProto(db_, EtcDir("com.android.sdkext") + "/extensions_db.pb");
android::derivesdk::SetSdkLevels(dir());
}
@@ -58,7 +58,7 @@
void SetApexVersion(const std::string apex, int version) {
SdkVersion sdk_version;
sdk_version.set_version(version);
- WriteProto(sdk_version, EtcDir(apex) + "/sdkinfo.binarypb");
+ WriteProto(sdk_version, EtcDir(apex) + "/sdkinfo.pb");
android::derivesdk::SetSdkLevels(dir());
}
diff --git a/gen_sdk/Android.bp b/gen_sdk/Android.bp
index b74e73b..7d3b9a8 100644
--- a/gen_sdk/Android.bp
+++ b/gen_sdk/Android.bp
@@ -41,16 +41,16 @@
}
genrule {
- name: "extensions_db.binarypb",
+ name: "extensions_db.pb",
srcs: ["extensions_db.textpb"],
- out: ["extensions_db.binarypb"],
+ out: ["extensions_db.pb"],
tools: ["gen_sdk"],
cmd: "$(location gen_sdk) --action print_binary --database $(location extensions_db.textpb) > $(out)",
}
prebuilt_etc {
name: "extensions_db",
- src: ":extensions_db.binarypb",
- filename: "extensions_db.binarypb",
+ src: ":extensions_db.pb",
+ filename: "extensions_db.pb",
installable: false,
}
diff --git a/testing/Android.bp b/testing/Android.bp
index 3d8fb9f..da2ccbc 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -47,7 +47,7 @@
genrule {
name: "sdkinfo_45_src",
- out: ["sdkinfo.binarypb"],
+ out: ["sdkinfo.pb"],
tools: ["gen_sdkinfo"],
cmd: "$(location) -v 45 -o $(out)",
}
@@ -55,7 +55,7 @@
prebuilt_etc {
name: "sdkinfo_45",
src: ":sdkinfo_45_src",
- filename: "sdkinfo.binarypb",
+ filename: "sdkinfo.pb",
installable: false,
visibility: [
":__pkg__",
@@ -64,9 +64,9 @@
}
genrule {
- name: "test_extensions_db.binarypb",
+ name: "test_extensions_db.pb",
srcs: ["test_extensions_db.textpb"],
- out: ["test_extensions_db.binarypb"],
+ out: ["test_extensions_db.pb"],
tools: ["gen_sdk"],
cmd: "$(location gen_sdk) --action print_binary --database $(location test_extensions_db.textpb) > $(out)",
visibility: ["//visibility:private"],
@@ -74,8 +74,8 @@
prebuilt_etc {
name: "test_extensions_db",
- src: ":test_extensions_db.binarypb",
- filename: "extensions_db.binarypb",
+ src: ":test_extensions_db.pb",
+ filename: "extensions_db.pb",
installable: false,
visibility: ["//visibility:private"],
}