diff options
author | Jaewoong Jung <jungjw@google.com> | 2019-02-28 16:22:30 +0000 |
---|---|---|
committer | Jaewoong Jung <jungjw@google.com> | 2019-02-28 16:22:30 +0000 |
commit | acb6db331bca698a806114f3de0fe8a04cdb5938 (patch) | |
tree | 2d4e4b6b56231815a7e00471146b77c01c4e5236 /java/app_test.go | |
parent | aa65e17016152d0d73cd10ab3987bc3bd5c2ef91 (diff) | |
download | android_build_soong-acb6db331bca698a806114f3de0fe8a04cdb5938.tar.gz android_build_soong-acb6db331bca698a806114f3de0fe8a04cdb5938.tar.bz2 android_build_soong-acb6db331bca698a806114f3de0fe8a04cdb5938.zip |
Revert "Add override_module."
This reverts commit aa65e17016152d0d73cd10ab3987bc3bd5c2ef91.
Reason for revert: Not compatible with PRODUCT_PACKAGES, and so has very limited use.
Change-Id: Ib141d3984a6f12bb50989e66037494c466b066f1
Diffstat (limited to 'java/app_test.go')
-rw-r--r-- | java/app_test.go | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/java/app_test.go b/java/app_test.go index 313844fa..317c7528 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -747,57 +747,3 @@ func TestPackageNameOverride(t *testing.T) { }) } } - -func TestOverrideModule(t *testing.T) { - ctx := testJava(t, ` - android_app { - name: "foo", - srcs: ["a.java"], - } - - override_module { - name: "bar", - base: "foo", - certificate: ":new_certificate", - manifest_package_name: "org.dandroid.bp", - } - - android_app_certificate { - name: "new_certificate", - certificate: "cert/new_cert", - } - `) - - // The base module still contains all the final outputs after overrides. - foo := ctx.ModuleForTests("foo", "android_common") - - // Check the final apk name - outputs := foo.AllOutputs() - e := buildDir + "/target/product/test_device/system/app/bar/bar.apk" - found := false - for _, o := range outputs { - if o == e { - found = true - break - } - } - if !found { - t.Errorf("Can't find %q in output files.\nAll outputs:%v", e, outputs) - } - - // Check the certificate paths - signapk := foo.Output("foo.apk") - signFlags := signapk.Args["certificates"] - e = "cert/new_cert.x509.pem cert/new_cert.pk8" - if e != signFlags { - t.Errorf("Incorrect signing flags, expected: %q, got: %q", e, signFlags) - } - - // Check the manifest package name - res := foo.Output("package-res.apk") - aapt2Flags := res.Args["flags"] - e = "--rename-manifest-package org.dandroid.bp" - if !strings.Contains(aapt2Flags, e) { - t.Errorf("package renaming flag, %q is missing in aapt2 link flags, %q", e, aapt2Flags) - } -} |