Skip to content

Commit

Permalink
Revert "add bp2build unit tests for aidl_interface"
Browse files Browse the repository at this point in the history
This reverts commit 1fa2672.

Reason for revert: breaks tradefed branch

Change-Id: I69bba531774031890baece1796df24d5534b93a9
  • Loading branch information
stnma7e committed Aug 29, 2022
1 parent 1fa2672 commit 105a704
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 259 deletions.
2 changes: 0 additions & 2 deletions bp2build/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ bootstrap_go_package {
"testing.go",
],
deps: [
"aidl-soong-rules",
"soong-android",
"soong-android-allowlists",
"soong-android-soongconfig",
Expand All @@ -37,7 +36,6 @@ bootstrap_go_package {
],
testSrcs: [
"aar_conversion_test.go",
"aidl_interface_conversion_test.go",
"android_app_certificate_conversion_test.go",
"android_app_conversion_test.go",
"apex_conversion_test.go",
Expand Down
249 changes: 0 additions & 249 deletions bp2build/aidl_interface_conversion_test.go

This file was deleted.

10 changes: 3 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
module android/soong

require (
google.golang.org/protobuf v0.0.0
github.com/google/blueprint v0.0.0
android/soong/aidl v0.0.0
)
require google.golang.org/protobuf v0.0.0

require github.com/google/blueprint v0.0.0

replace google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf

replace github.com/google/blueprint v0.0.0 => ../blueprint

replace android/soong/aidl v0.0.0 => ../../system/tools/aidl/build

// Indirect deps from golang-protobuf
exclude github.com/golang/protobuf v1.5.0

Expand Down
1 change: 0 additions & 1 deletion tests/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ function create_mock_soong {
symlink_directory external/go-cmp
symlink_directory external/golang-protobuf
symlink_directory external/starlark-go
symlink_directory system/tools/aidl

touch "$MOCK_TOP/Android.bp"
}
Expand Down

0 comments on commit 105a704

Please sign in to comment.