diff options
-rw-r--r-- | Android.bp | 79 | ||||
-rw-r--r-- | TEST_MAPPING | 57 | ||||
-rw-r--r-- | cargo2android.json | 9 |
3 files changed, 6 insertions, 139 deletions
@@ -1,5 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. -// Do not modify this file as changes will be overridden on upgrade. +// This file is generated by cargo2android.py --run --device --dependencies. package { default_applicable_licenses: ["external_rust_crates_num-integer_license"], @@ -39,88 +38,22 @@ license { rust_library { name: "libnum_integer", - // has rustc warnings host_supported: true, crate_name: "num_integer", - cargo_env_compat: true, - cargo_pkg_version: "0.1.44", srcs: ["src/lib.rs"], edition: "2015", features: [ "default", "std", ], - cfgs: ["has_i128"], - rustlibs: [ - "libnum_traits", + flags: [ + "--cfg has_i128", ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], -} - -rust_test { - name: "num-integer_test_src_lib", - // has rustc warnings - host_supported: true, - crate_name: "num_integer", - cargo_env_compat: true, - cargo_pkg_version: "0.1.44", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2015", - features: [ - "default", - "std", - ], - cfgs: ["has_i128"], rustlibs: [ "libnum_traits", ], } -rust_defaults { - name: "num-integer_test_defaults", - crate_name: "num_integer", - cargo_env_compat: true, - cargo_pkg_version: "0.1.44", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: [ - "default", - "std", - ], - cfgs: ["has_i128"], - rustlibs: [ - "libnum_integer", - "libnum_traits", - ], -} - -rust_test { - name: "num-integer_test_tests_average", - defaults: ["num-integer_test_defaults"], - // has rustc warnings - host_supported: true, - srcs: ["tests/average.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "num-integer_test_tests_roots", - defaults: ["num-integer_test_defaults"], - // has rustc warnings - host_supported: true, - srcs: ["tests/roots.rs"], - test_options: { - unit_test: true, - }, -} +// dependent_library ["feature_list"] +// autocfg-1.0.1 +// num-traits-0.2.14 "std" diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 410aa98..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,57 +0,0 @@ -// Generated by update_crate_tests.py for tests that depend on this crate. -{ - "imports": [ - { - "path": "external/rust/crates/num-bigint" - }, - { - "path": "external/rust/crates/oid-registry" - } - ], - "presubmit": [ - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libcert_request_validator_tests" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "num-integer_test_src_lib" - }, - { - "name": "num-integer_test_tests_average" - }, - { - "name": "num-integer_test_tests_roots" - } - ], - "presubmit-rust": [ - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libcert_request_validator_tests" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "num-integer_test_src_lib" - }, - { - "name": "num-integer_test_tests_average" - }, - { - "name": "num-integer_test_tests_roots" - } - ] -} diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 8e490de..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "device": true, - "run": true, - "tests": true -} |